diff --git a/build.gradle b/build.gradle
index 48f6f22d..1d3d3c99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group 'org.iot.dsa'
-version '0.11.0'
+version '0.20.0'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index 1d622a1a..b66af8df 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -53,22 +53,22 @@ Nodes are where application specific logic is bound to the link architecture.  N
 will use various lifecycle callbacks to trigger their logic.
 
 First you must create a root node.  It is the hook for the rest of your functionality.  The 
-convention is to name it RootNode, but make sure it is in a unique package so that multiple links
+convention is to name it MainNode, but make sure it is in a unique package so that multiple links
 can be run in the same process. 
 
 Then you will probably create additional nodes that will be descendants in the tree rooted by your 
 root node.
 
-### Root Node
+### Main Node
 
 All links require a single root node and it must subclass 
-[org.iot.dsa.dslink.DSRootNode](https://iot-dsa-v2.github.io/sdk-dslink-java-v2/javadoc/index.html?org/iot/dsa/dslink/DSRootNode.html). 
-The convention is to name the class RootNode but the package must be unique from any other 
-RootNodes so that multiple links can be run in the same process.
+[org.iot.dsa.dslink.DSMainNode](https://iot-dsa-v2.github.io/sdk-dslink-java-v2/javadoc/index.html?org/iot/dsa/dslink/DSMainNode.html). 
+The convention is to name the class MainNode but the package must be unique from any other 
+MainNodes so that multiple links can be run in the same process.
 
 When a link launches the first time, the type of the root node is looked up **dslink.json**.
-The config _rootType_ must store the fully qualified class name of the root node.  After the first 
-launch, the configuration database is serialized and the _rootType_ config will longer have an 
+The config _mainType_ must store the fully qualified class name of the root node.  After the first 
+launch, the configuration database is serialized and the _mainType_ config will longer have an 
 impact.
 
 ### Additional Nodes
diff --git a/docs/javadoc/allclasses-frame.html b/docs/javadoc/allclasses-frame.html
index 9d715b66..3e5d4768 100644
--- a/docs/javadoc/allclasses-frame.html
+++ b/docs/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>All Classes (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>All Classes (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -27,11 +27,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder" target="classFrame"><span class="interfaceName">ApiObject</span></a></li>
 <li><a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging" target="classFrame">AsyncLogHandler</a></li>
 <li><a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action" target="classFrame">DSAction</a></li>
+<li><a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action" target="classFrame">DSActionValues</a></li>
 <li><a href="org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io" target="classFrame">DSBase64</a></li>
 <li><a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node" target="classFrame">DSBool</a></li>
-<li><a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io" target="classFrame">DSByteBuffer</a></li>
 <li><a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node" target="classFrame">DSBytes</a></li>
-<li><a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io" target="classFrame">DSCharBuffer</a></li>
 <li><a href="org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time" target="classFrame">DSDateTime</a></li>
 <li><a href="org/iot/dsa/node/DSDouble.html" title="class in org.iot.dsa.node" target="classFrame">DSDouble</a></li>
 <li><a href="org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node" target="classFrame">DSElement</a></li>
@@ -42,23 +41,26 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node" target="classFrame">DSGroup</a></li>
 <li><a href="org/iot/dsa/node/DSIBoolean.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIBoolean</span></a></li>
 <li><a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIEnum</span></a></li>
+<li><a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event" target="classFrame"><span class="interfaceName">DSIEvent</span></a></li>
+<li><a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging" target="classFrame"><span class="interfaceName">DSILevels</span></a></li>
 <li><a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIMetadata</span></a></li>
 <li><a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node" target="classFrame">DSInfo</a></li>
+<li><a href="org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event" target="classFrame">DSInfoTopic</a></li>
+<li><a href="org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event" target="classFrame">DSInfoTopic.Event</a></li>
 <li><a href="org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node" target="classFrame">DSInt</a></li>
+<li><a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSInternalErrorException</a></li>
 <li><a href="org/iot/dsa/time/DSInterval.html" title="enum in org.iot.dsa.time" target="classFrame">DSInterval</a></li>
 <li><a href="org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSINumber</span></a></li>
 <li><a href="org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSInvalidPathException</a></li>
 <li><a href="org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIObject</span></a></li>
-<li><a href="org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io" target="classFrame">DSIoException</a></li>
 <li><a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security" target="classFrame"><span class="interfaceName">DSIPassword</span></a></li>
-<li><a href="org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIPublisher</span></a></li>
-<li><a href="org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node" target="classFrame">DSIPublisher.Event</a></li>
 <li><a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io" target="classFrame"><span class="interfaceName">DSIReader</span></a></li>
 <li><a href="org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io" target="classFrame">DSIReader.Token</a></li>
 <li><a href="org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSIRequester</span></a></li>
 <li><a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSIResponder</span></a></li>
 <li><a href="org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIStatus</span></a></li>
-<li><a href="org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSISubscriber</span></a></li>
+<li><a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIStorable</span></a></li>
+<li><a href="org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event" target="classFrame"><span class="interfaceName">DSISubscriber</span></a></li>
 <li><a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIValue</span></a></li>
 <li><a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io" target="classFrame"><span class="interfaceName">DSIWriter</span></a></li>
 <li><a href="org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node" target="classFrame">DSJavaEnum</a></li>
@@ -68,11 +70,11 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink" target="classFrame">DSLinkConfig</a></li>
 <li><a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink" target="classFrame">DSLinkConnection</a></li>
 <li><a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSLinkConnection.Listener</span></a></li>
-<li><a href="org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSLinkSession</span></a></li>
 <li><a href="org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node" target="classFrame">DSList</a></li>
 <li><a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging" target="classFrame">DSLogger</a></li>
 <li><a href="org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging" target="classFrame">DSLogging</a></li>
 <li><a href="org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node" target="classFrame">DSLong</a></li>
+<li><a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink" target="classFrame">DSMainNode</a></li>
 <li><a href="org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node" target="classFrame">DSMap</a></li>
 <li><a href="org/iot/dsa/node/DSMap.Entry.html" title="class in org.iot.dsa.node" target="classFrame">DSMap.Entry</a></li>
 <li><a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node" target="classFrame">DSMetadata</a></li>
@@ -85,15 +87,21 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSPermissionException</a></li>
 <li><a href="org/iot/dsa/node/DSRegistry.html" title="class in org.iot.dsa.node" target="classFrame">DSRegistry</a></li>
 <li><a href="org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSRequestException</a></li>
-<li><a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink" target="classFrame">DSRootNode</a></li>
 <li><a href="org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa" target="classFrame">DSRuntime</a></li>
 <li><a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa" target="classFrame">DSRuntime.Timer</a></li>
 <li><a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node" target="classFrame">DSStatus</a></li>
 <li><a href="org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node" target="classFrame">DSString</a></li>
+<li><a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink" target="classFrame">DSSysNode</a></li>
 <li><a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time" target="classFrame">DSTime</a></li>
+<li><a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event" target="classFrame">DSTopic</a></li>
+<li><a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSUnsupportedException</a></li>
 <li><a href="org/iot/dsa/util/DSUtil.html" title="class in org.iot.dsa.util" target="classFrame">DSUtil</a></li>
 <li><a href="org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node" target="classFrame">DSValue</a></li>
+<li><a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node" target="classFrame">DSValueNode</a></li>
+<li><a href="org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event" target="classFrame">DSValueTopic</a></li>
+<li><a href="org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event" target="classFrame">DSValueTopic.Event</a></li>
 <li><a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node" target="classFrame">DSValueType</a></li>
+<li><a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester" target="classFrame">ErrorType</a></li>
 <li><a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging" target="classFrame">FileLogHandler</a></li>
 <li><a href="org/iot/dsa/dslink/responder/InboundInvokeRequest.html" title="interface in org.iot.dsa.dslink.responder" target="classFrame"><span class="interfaceName">InboundInvokeRequest</span></a></li>
 <li><a href="org/iot/dsa/dslink/responder/InboundListRequest.html" title="interface in org.iot.dsa.dslink.responder" target="classFrame"><span class="interfaceName">InboundListRequest</span></a></li>
@@ -104,8 +112,6 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/io/json/JsonConstants.html" title="interface in org.iot.dsa.io.json" target="classFrame"><span class="interfaceName">JsonConstants</span></a></li>
 <li><a href="org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json" target="classFrame">JsonReader</a></li>
 <li><a href="org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json" target="classFrame">JsonWriter</a></li>
-<li><a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack" target="classFrame">MsgpackReader</a></li>
-<li><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack" target="classFrame">MsgpackWriter</a></li>
 <li><a href="org/iot/dsa/io/NodeDecoder.html" title="class in org.iot.dsa.io" target="classFrame">NodeDecoder</a></li>
 <li><a href="org/iot/dsa/io/NodeEncoder.html" title="class in org.iot.dsa.io" target="classFrame">NodeEncoder</a></li>
 <li><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester" target="classFrame"><span class="interfaceName">OutboundInvokeHandler</span></a></li>
@@ -116,6 +122,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/requester/OutboundStream.html" title="interface in org.iot.dsa.dslink.requester" target="classFrame"><span class="interfaceName">OutboundStream</span></a></li>
 <li><a href="org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester" target="classFrame"><span class="interfaceName">OutboundSubscribeHandler</span></a></li>
 <li><a href="org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging" target="classFrame">PrintStreamLogHandler</a></li>
+<li><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">SimpleInvokeHandler</a></li>
 <li><a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">SimpleRequestHandler</a></li>
 <li><a href="org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html" title="interface in org.iot.dsa.dslink.responder" target="classFrame"><span class="interfaceName">SubscriptionCloseHandler</span></a></li>
 </ul>
diff --git a/docs/javadoc/allclasses-noframe.html b/docs/javadoc/allclasses-noframe.html
index 46ed1421..3d41ff36 100644
--- a/docs/javadoc/allclasses-noframe.html
+++ b/docs/javadoc/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>All Classes (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>All Classes (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -27,11 +27,10 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder"><span class="interfaceName">ApiObject</span></a></li>
 <li><a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></li>
 <li><a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></li>
+<li><a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></li>
 <li><a href="org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io">DSBase64</a></li>
 <li><a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></li>
-<li><a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></li>
 <li><a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></li>
-<li><a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></li>
 <li><a href="org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a></li>
 <li><a href="org/iot/dsa/node/DSDouble.html" title="class in org.iot.dsa.node">DSDouble</a></li>
 <li><a href="org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></li>
@@ -42,23 +41,26 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></li>
 <li><a href="org/iot/dsa/node/DSIBoolean.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIBoolean</span></a></li>
 <li><a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIEnum</span></a></li>
+<li><a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><span class="interfaceName">DSIEvent</span></a></li>
+<li><a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="interfaceName">DSILevels</span></a></li>
 <li><a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIMetadata</span></a></li>
 <li><a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></li>
+<li><a href="org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a></li>
+<li><a href="org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a></li>
 <li><a href="org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node">DSInt</a></li>
+<li><a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink">DSInternalErrorException</a></li>
 <li><a href="org/iot/dsa/time/DSInterval.html" title="enum in org.iot.dsa.time">DSInterval</a></li>
 <li><a href="org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSINumber</span></a></li>
 <li><a href="org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink">DSInvalidPathException</a></li>
 <li><a href="org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIObject</span></a></li>
-<li><a href="org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></li>
 <li><a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security"><span class="interfaceName">DSIPassword</span></a></li>
-<li><a href="org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIPublisher</span></a></li>
-<li><a href="org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a></li>
 <li><a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><span class="interfaceName">DSIReader</span></a></li>
 <li><a href="org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io">DSIReader.Token</a></li>
 <li><a href="org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink"><span class="interfaceName">DSIRequester</span></a></li>
 <li><a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink"><span class="interfaceName">DSIResponder</span></a></li>
 <li><a href="org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIStatus</span></a></li>
-<li><a href="org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSISubscriber</span></a></li>
+<li><a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIStorable</span></a></li>
+<li><a href="org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="interfaceName">DSISubscriber</span></a></li>
 <li><a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node"><span class="interfaceName">DSIValue</span></a></li>
 <li><a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io"><span class="interfaceName">DSIWriter</span></a></li>
 <li><a href="org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a></li>
@@ -68,11 +70,11 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></li>
 <li><a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></li>
 <li><a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="interfaceName">DSLinkConnection.Listener</span></a></li>
-<li><a href="org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="interfaceName">DSLinkSession</span></a></li>
 <li><a href="org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a></li>
 <li><a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></li>
 <li><a href="org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging">DSLogging</a></li>
 <li><a href="org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a></li>
+<li><a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></li>
 <li><a href="org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></li>
 <li><a href="org/iot/dsa/node/DSMap.Entry.html" title="class in org.iot.dsa.node">DSMap.Entry</a></li>
 <li><a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></li>
@@ -85,15 +87,21 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink">DSPermissionException</a></li>
 <li><a href="org/iot/dsa/node/DSRegistry.html" title="class in org.iot.dsa.node">DSRegistry</a></li>
 <li><a href="org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">DSRequestException</a></li>
-<li><a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></li>
 <li><a href="org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa">DSRuntime</a></li>
 <li><a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a></li>
 <li><a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></li>
 <li><a href="org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></li>
+<li><a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></li>
 <li><a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></li>
+<li><a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></li>
+<li><a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink">DSUnsupportedException</a></li>
 <li><a href="org/iot/dsa/util/DSUtil.html" title="class in org.iot.dsa.util">DSUtil</a></li>
 <li><a href="org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></li>
+<li><a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></li>
+<li><a href="org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></li>
+<li><a href="org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></li>
 <li><a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></li>
+<li><a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a></li>
 <li><a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></li>
 <li><a href="org/iot/dsa/dslink/responder/InboundInvokeRequest.html" title="interface in org.iot.dsa.dslink.responder"><span class="interfaceName">InboundInvokeRequest</span></a></li>
 <li><a href="org/iot/dsa/dslink/responder/InboundListRequest.html" title="interface in org.iot.dsa.dslink.responder"><span class="interfaceName">InboundListRequest</span></a></li>
@@ -104,8 +112,6 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/io/json/JsonConstants.html" title="interface in org.iot.dsa.io.json"><span class="interfaceName">JsonConstants</span></a></li>
 <li><a href="org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json">JsonReader</a></li>
 <li><a href="org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json">JsonWriter</a></li>
-<li><a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></li>
-<li><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></li>
 <li><a href="org/iot/dsa/io/NodeDecoder.html" title="class in org.iot.dsa.io">NodeDecoder</a></li>
 <li><a href="org/iot/dsa/io/NodeEncoder.html" title="class in org.iot.dsa.io">NodeEncoder</a></li>
 <li><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="interfaceName">OutboundInvokeHandler</span></a></li>
@@ -116,6 +122,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
 <li><a href="org/iot/dsa/dslink/requester/OutboundStream.html" title="interface in org.iot.dsa.dslink.requester"><span class="interfaceName">OutboundStream</span></a></li>
 <li><a href="org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="interfaceName">OutboundSubscribeHandler</span></a></li>
 <li><a href="org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging">PrintStreamLogHandler</a></li>
+<li><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></li>
 <li><a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></li>
 <li><a href="org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html" title="interface in org.iot.dsa.dslink.responder"><span class="interfaceName">SubscriptionCloseHandler</span></a></li>
 </ul>
diff --git a/docs/javadoc/constant-values.html b/docs/javadoc/constant-values.html
index c6271554..9e3f6e34 100644
--- a/docs/javadoc/constant-values.html
+++ b/docs/javadoc/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>Constant Field Values (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Constant Field Values (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (dslink-core 0.11.0 API)";
+            parent.document.title="Constant Field Values (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -111,20 +111,6 @@ <h2 title="org.iot">org.iot.*</h2>
 <td class="colLast"><code>"connectionType"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_IS_REQUESTER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_IS_REQUESTER">CFG_IS_REQUESTER</a></code></td>
-<td class="colLast"><code>"isRequester"</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_IS_RESPONDER">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_IS_RESPONDER">CFG_IS_RESPONDER</a></code></td>
-<td class="colLast"><code>"isResponder"</code></td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_KEY_FILE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
@@ -132,40 +118,26 @@ <h2 title="org.iot">org.iot.*</h2>
 <td class="colLast"><code>"key"</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_LOG_FILE">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_LOG_FILE">CFG_LOG_FILE</a></code></td>
-<td class="colLast"><code>"logFile"</code></td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_LOG_LEVEL">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_LOG_LEVEL">CFG_LOG_LEVEL</a></code></td>
 <td class="colLast"><code>"log"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_NODE_FILE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_NODE_FILE">CFG_NODE_FILE</a></code></td>
 <td class="colLast"><code>"nodes"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_READ_TIMEOUT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_READ_TIMEOUT">CFG_READ_TIMEOUT</a></code></td>
 <td class="colLast"><code>"readTimeout"</code></td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_ROOT_TYPE">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_ROOT_TYPE">CFG_ROOT_TYPE</a></code></td>
-<td class="colLast"><code>"rootType"</code></td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_SAVE_INTERVAL">
 <!--   -->
@@ -181,11 +153,11 @@ <h2 title="org.iot">org.iot.*</h2>
 <td class="colLast"><code>"stableDelay"</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_TRANSPORT_FACTORY">
+<td class="colFirst"><a name="org.iot.dsa.dslink.DSLinkConfig.CFG_WS_TRANSPORT_FACTORY">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
-<td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_TRANSPORT_FACTORY">CFG_TRANSPORT_FACTORY</a></code></td>
-<td class="colLast"><code>"transportFactory"</code></td>
+<td><code><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_WS_TRANSPORT_FACTORY">CFG_WS_TRANSPORT_FACTORY</a></code></td>
+<td class="colLast"><code>"wsTransportFactory"</code></td>
 </tr>
 </tbody>
 </table>
@@ -229,201 +201,7 @@ <h2 title="org.iot">org.iot.*</h2>
 <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>org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</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="org.iot.dsa.io.msgpack.MsgpackReader.BIN16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>BIN16</code></td>
-<td class="colLast"><code>-59</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.BIN32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>BIN32</code></td>
-<td class="colLast"><code>-58</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.BIN8">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>BIN8</code></td>
-<td class="colLast"><code>-60</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.FALSE">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FALSE</code></td>
-<td class="colLast"><code>-62</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.FIXLIST_PREFIX">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FIXLIST_PREFIX</code></td>
-<td class="colLast"><code>-112</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.FIXMAP_PREFIX">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FIXMAP_PREFIX</code></td>
-<td class="colLast"><code>-128</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.FIXSTR_PREFIX">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FIXSTR_PREFIX</code></td>
-<td class="colLast"><code>-96</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.FLOAT32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FLOAT32</code></td>
-<td class="colLast"><code>-54</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.FLOAT64">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FLOAT64</code></td>
-<td class="colLast"><code>-53</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.INT16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT16</code></td>
-<td class="colLast"><code>-47</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.INT32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT32</code></td>
-<td class="colLast"><code>-46</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.INT64">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT64</code></td>
-<td class="colLast"><code>-45</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.INT8">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT8</code></td>
-<td class="colLast"><code>-48</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.LIST16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>LIST16</code></td>
-<td class="colLast"><code>-36</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.LIST32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>LIST32</code></td>
-<td class="colLast"><code>-35</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.MAP16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>MAP16</code></td>
-<td class="colLast"><code>-34</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.MAP32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>MAP32</code></td>
-<td class="colLast"><code>-33</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.NULL">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>NULL</code></td>
-<td class="colLast"><code>-64</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.STR16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>STR16</code></td>
-<td class="colLast"><code>-38</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.STR32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>STR32</code></td>
-<td class="colLast"><code>-37</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.STR8">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>STR8</code></td>
-<td class="colLast"><code>-39</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.TRUE">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>TRUE</code></td>
-<td class="colLast"><code>-61</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.UINT16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT16</code></td>
-<td class="colLast"><code>-51</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.UINT32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT32</code></td>
-<td class="colLast"><code>-50</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.UINT64">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT64</code></td>
-<td class="colLast"><code>-49</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackReader.UINT8">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT8</code></td>
-<td class="colLast"><code>-52</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>org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></span><span class="tabEnd">&nbsp;</span></caption>
+<caption><span>org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th scope="col">Constant Field</th>
@@ -431,186 +209,67 @@ <h2 title="org.iot">org.iot.*</h2>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.BIN16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>BIN16</code></td>
-<td class="colLast"><code>-59</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.BIN32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>BIN32</code></td>
-<td class="colLast"><code>-58</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.BIN8">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>BIN8</code></td>
-<td class="colLast"><code>-60</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.FALSE">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FALSE</code></td>
-<td class="colLast"><code>-62</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.FIXLIST_PREFIX">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FIXLIST_PREFIX</code></td>
-<td class="colLast"><code>-112</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.FIXMAP_PREFIX">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FIXMAP_PREFIX</code></td>
-<td class="colLast"><code>-128</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.FIXSTR_PREFIX">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FIXSTR_PREFIX</code></td>
-<td class="colLast"><code>-96</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.FLOAT32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FLOAT32</code></td>
-<td class="colLast"><code>-54</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.FLOAT64">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>FLOAT64</code></td>
-<td class="colLast"><code>-53</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.INT16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT16</code></td>
-<td class="colLast"><code>-47</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.INT32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT32</code></td>
-<td class="colLast"><code>-46</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.INT64">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT64</code></td>
-<td class="colLast"><code>-45</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.INT8">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>INT8</code></td>
-<td class="colLast"><code>-48</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.LIST16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>LIST16</code></td>
-<td class="colLast"><code>-36</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.LIST32">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>LIST32</code></td>
-<td class="colLast"><code>-35</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.MAP16">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>MAP16</code></td>
-<td class="colLast"><code>-34</code></td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.MAP32">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.ADMIN">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>MAP32</code></td>
-<td class="colLast"><code>-33</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a></code></td>
+<td class="colLast"><code>950</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.NULL">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.CONFIG">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>NULL</code></td>
-<td class="colLast"><code>-64</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a></code></td>
+<td class="colLast"><code>700</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.STR16">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.DEBUG">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>STR16</code></td>
-<td class="colLast"><code>-38</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a></code></td>
+<td class="colLast"><code>400</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.STR32">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.ERROR">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>STR32</code></td>
-<td class="colLast"><code>-37</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a></code></td>
+<td class="colLast"><code>900</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.STR8">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.FATAL">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>STR8</code></td>
-<td class="colLast"><code>-39</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a></code></td>
+<td class="colLast"><code>1000</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.TRUE">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.FINE">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>TRUE</code></td>
-<td class="colLast"><code>-61</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#FINE">FINE</a></code></td>
+<td class="colLast"><code>500</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.UINT16">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.INFO">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT16</code></td>
-<td class="colLast"><code>-51</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#INFO">INFO</a></code></td>
+<td class="colLast"><code>800</code></td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.UINT32">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.TRACE">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT32</code></td>
-<td class="colLast"><code>-50</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a></code></td>
+<td class="colLast"><code>300</code></td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.UINT64">
-<!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT64</code></td>
-<td class="colLast"><code>-49</code></td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a name="org.iot.dsa.io.msgpack.MsgpackWriter.UINT8">
+<td class="colFirst"><a name="org.iot.dsa.logging.DSILevels.WARN">
 <!--   -->
-</a><code>public&nbsp;static&nbsp;final&nbsp;byte</code></td>
-<td><code>UINT8</code></td>
-<td class="colLast"><code>-52</code></td>
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></td>
+<td class="colLast"><code>750</code></td>
 </tr>
 </tbody>
 </table>
@@ -655,55 +314,62 @@ <h2 title="org.iot">org.iot.*</h2>
 <td class="colLast"><code>"description"</code></td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.DISPLAY_NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="org/iot/dsa/node/DSMetadata.html#DISPLAY_NAME">DISPLAY_NAME</a></code></td>
+<td class="colLast"><code>"displayName"</code></td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.EDITOR">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#EDITOR">EDITOR</a></code></td>
 <td class="colLast"><code>"editor"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.ENUM_RANGE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#ENUM_RANGE">ENUM_RANGE</a></code></td>
 <td class="colLast"><code>"enumRange"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.MAX_VALUE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#MAX_VALUE">MAX_VALUE</a></code></td>
 <td class="colLast"><code>"maxValue"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.MIN_VALUE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#MIN_VALUE">MIN_VALUE</a></code></td>
 <td class="colLast"><code>"minValue"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.NAME">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#NAME">NAME</a></code></td>
 <td class="colLast"><code>"name"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.PLACEHOLDER">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#PLACEHOLDER">PLACEHOLDER</a></code></td>
 <td class="colLast"><code>"placeholder"</code></td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.TYPE">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="org/iot/dsa/node/DSMetadata.html#TYPE">TYPE</a></code></td>
 <td class="colLast"><code>"type"</code></td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a name="org.iot.dsa.node.DSMetadata.UNIT">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
diff --git a/docs/javadoc/deprecated-list.html b/docs/javadoc/deprecated-list.html
index 17ecf3eb..6abb4b7a 100644
--- a/docs/javadoc/deprecated-list.html
+++ b/docs/javadoc/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>Deprecated List (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Deprecated List (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (dslink-core 0.11.0 API)";
+            parent.document.title="Deprecated List (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/help-doc.html b/docs/javadoc/help-doc.html
index 16a39ab7..003cd053 100644
--- a/docs/javadoc/help-doc.html
+++ b/docs/javadoc/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>API Help (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>API Help (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (dslink-core 0.11.0 API)";
+            parent.document.title="API Help (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/index-all.html b/docs/javadoc/index-all.html
index 6fb7d1eb..c08c4170 100644
--- a/docs/javadoc/index-all.html
+++ b/docs/javadoc/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>Index (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Index (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (dslink-core 0.11.0 API)";
+            parent.document.title="Index (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -231,6 +231,10 @@ <h2 class="title">A</h2>
 <div class="block">Creates a DSMetadata, calls setName and setType on it, adds the internal map to the parameter
  list and returns the metadata instance for further configuration.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSActionValues.html#addResult-org.iot.dsa.node.DSIValue-">addResult(DSIValue)</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dt>
+<dd>
+<div class="block">Values must be added in the same order they were defined in the action.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSTime.html#addSeconds-int-java.util.Calendar-">addSeconds(int, Calendar)</a></span> - Static method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></dt>
 <dd>
 <div class="block">Adds or subtracts the corresponding time field, does not perform any alignment.</div>
@@ -269,6 +273,18 @@ <h2 class="title">A</h2>
 <dd>
 <div class="block">Adds or subtracts the corresponding time field, does not perform any alignment.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#admin">admin</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#admin--">admin()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">True if the level is loggable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSTime.html#alignDay-java.util.Calendar-">alignDay(Calendar)</a></span> - Static method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></dt>
 <dd>
 <div class="block">Aligns the time fields to the start of the day.</div>
@@ -313,6 +329,8 @@ <h2 class="title">A</h2>
 <dd>
 <div class="block">Aligns the time fields to the start of the year.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#all">all</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder"><span class="typeNameLink">ApiObject</span></a> - Interface in <a href="org/iot/dsa/dslink/responder/package-summary.html">org.iot.dsa.dslink.responder</a></dt>
 <dd>
 <div class="block">Can be a node, value or an action.</div>
@@ -355,36 +373,36 @@ <h2 class="title">A</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/AsyncLogHandler.html#AsyncLogHandler--">AsyncLogHandler()</a></span> - Constructor for class org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#available--">available()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">The number of bytes available for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#available--">available()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">The number of chars available for reading.</div>
-</dd>
 </dl>
 <a name="I:B">
 <!--   -->
 </a>
 <h2 class="title">B</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/AsyncLogHandler.html#backlog--">backlog()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></dt>
-<dd>
-<div class="block">The number of items on the queue.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#beginList--">beginList()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#beginList-int-">beginList(int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIWriter.html#beginList--">beginList()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></dt>
 <dd>
 <div class="block">Start a new list and return this.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIWriter.html#beginList-int-">beginList(int)</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></dt>
+<dd>
+<div class="block">Start a new list of the given size and return this.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#beginMap-int-">beginMap(int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></dt>
 <dd>
 <div class="block">Start a new map and return this.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIWriter.html#beginMap-int-">beginMap(int)</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></dt>
+<dd>
+<div class="block">Start a new map of the given size and return this.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#BOOLEAN_RANGE">BOOLEAN_RANGE</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -404,36 +422,24 @@ <h2 class="title">C</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_CONNECTION_TYPE">CFG_CONNECTION_TYPE</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_IS_REQUESTER">CFG_IS_REQUESTER</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_IS_RESPONDER">CFG_IS_RESPONDER</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_KEY_FILE">CFG_KEY_FILE</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_LOG_FILE">CFG_LOG_FILE</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_LOG_LEVEL">CFG_LOG_LEVEL</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_NODE_FILE">CFG_NODE_FILE</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_READ_TIMEOUT">CFG_READ_TIMEOUT</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_ROOT_TYPE">CFG_ROOT_TYPE</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_SAVE_INTERVAL">CFG_SAVE_INTERVAL</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_STABLE_DELAY">CFG_STABLE_DELAY</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_TRANSPORT_FACTORY">CFG_TRANSPORT_FACTORY</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#CFG_WS_TRANSPORT_FACTORY">CFG_WS_TRANSPORT_FACTORY</a></span> - Static variable in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/InboundListRequest.html#childAdded-org.iot.dsa.dslink.responder.ApiObject-">childAdded(ApiObject)</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/InboundListRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundListRequest</a></dt>
 <dd>
 <div class="block">The responder should call this whenever a child is added.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#childChanged-org.iot.dsa.node.DSInfo-">childChanged(DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
-<dd>
-<div class="block">Can be used to force a child changed event for the given child.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#childCount--">childCount()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">The number of children.</div>
@@ -474,14 +480,6 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">Allows the responder to forcefully terminate the subscription.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#close--">close()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Important for notifying waiting threads.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#close--">close()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Important for notifying waiting threads.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIReader.html#close--">close()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></dt>
 <dd>
 <div class="block">Close the input.</div>
@@ -496,12 +494,14 @@ <h2 class="title">C</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/JsonWriter.html#close--">close()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json">JsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#close--">close()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/AsyncLogHandler.html#close--">close()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></dt>
 <dd>
 <div class="block">Closes the PrintStream, terminates the write thread and performs houseKeeping.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogging.html#close--">close()</a></span> - Static method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging">DSLogging</a></dt>
+<dd>
+<div class="block">Closes all async log handlers.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionInvocation.html#close--">close()</a></span> - Method in interface org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a></dt>
 <dd>
 <div class="block">For use with streams and open tables, will have no effect if the stream is already closed.</div>
@@ -514,11 +514,11 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">Allows the requester to close the stream.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#config--">config()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#concat-java.lang.String-java.lang.String-java.lang.StringBuilder-">concat(String, String, StringBuilder)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
 <dd>
-<div class="block">True if the level is loggable.</div>
+<div class="block">Concatenates the two paths into the given bucket.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#config-java.lang.Object-">config(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#CONFIG_FAULT">CONFIG_FAULT</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
@@ -567,6 +567,10 @@ <h2 class="title">C</h2>
 <dd>
 <div class="block">Returns this.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSTopic.html#copy--">copy()</a></span> - Method in class org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></dt>
+<dd>
+<div class="block">Returns this.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSInterval.html#count-long-long-">count(long, long)</a></span> - Method in enum org.iot.dsa.time.<a href="org/iot/dsa/time/DSInterval.html" title="enum in org.iot.dsa.time">DSInterval</a></dt>
 <dd>
 <div class="block">Returns the number of intervals for the given time range, or -1 if indeterminate.</div>
@@ -593,6 +597,22 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">How Double.POSITIVE_INFINITY is encoded: "\\u001BInfinity"</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#debug">debug</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#debug--">debug()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">True if the level is loggable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">Log a debug event.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">Log a debug event.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#DECIMAL_PLACES">DECIMAL_PLACES</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault(String, DSIObject)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
@@ -603,6 +623,8 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Adds the save action, overrides should call super if they want this action.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#declareDefaults--">declareDefaults()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">The is only called once for each class.</div>
@@ -634,13 +656,13 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Decodes an instance that was encoded with encodeKeys().</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#decodePath-java.lang.String-">decodePath(String)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#decodeName-java.lang.String-">decodeName(String)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
 <dd>
-<div class="block">Splits the path and decodes each individual name.</div>
+<div class="block">Un-escapes a name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#decodePathName-java.lang.String-">decodePathName(String)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#decodePath-java.lang.String-">decodePath(String)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
 <dd>
-<div class="block">Un-escapes a name.</div>
+<div class="block">Splits the path and decodes each individual name.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.html#decodePrivate-byte:A-">decodePrivate(byte[])</a></span> - Static method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a></dt>
 <dd>
@@ -684,6 +706,12 @@ <h2 class="title">D</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#DISABLED_STR">DISABLED_STR</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#disconnect--">disconnect()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">Forcefully closes an open connection.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#DISPLAY_NAME">DISPLAY_NAME</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#DOWN">DOWN</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
 <div class="block">Bad, communications are down within DSA.</div>
@@ -698,6 +726,12 @@ <h2 class="title">D</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSAction.html#DSAction--">DSAction()</a></span> - Constructor for class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">DSActionValues</span></a> - Class in <a href="org/iot/dsa/node/action/package-summary.html">org.iot.dsa.node.action</a></dt>
+<dd>
+<div class="block">This is a convenience implementation of ActionValues.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSActionValues.html#DSActionValues-org.iot.dsa.node.action.DSAction-">DSActionValues(DSAction)</a></span> - Constructor for class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSBase64</span></a> - Class in <a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></dt>
 <dd>
 <div class="block">Thread-safe Base64 encoder and decoder.</div>
@@ -708,26 +742,10 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Represents a boolean value.</div>
 </dd>
-<dt><a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSByteBuffer</span></a> - Class in <a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></dt>
-<dd>
-<div class="block">A buffer for storing bytes being pushed from an input stream.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#DSByteBuffer--">DSByteBuffer()</a></span> - Constructor for class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#DSByteBuffer-int-">DSByteBuffer(int)</a></span> - Constructor for class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSBytes</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
 <div class="block">Byte array that gets encoded as a base64 string.</div>
 </dd>
-<dt><a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSCharBuffer</span></a> - Class in <a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></dt>
-<dd>
-<div class="block">A buffer for storing chars being pushed from a reader.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#DSCharBuffer--">DSCharBuffer()</a></span> - Constructor for class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#DSCharBuffer-int-">DSCharBuffer(int)</a></span> - Constructor for class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time"><span class="typeNameLink">DSDateTime</span></a> - Class in <a href="org/iot/dsa/time/package-summary.html">org.iot.dsa.time</a></dt>
 <dd>
 <div class="block">Wrapper for Java time.</div>
@@ -750,7 +768,7 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">An runtime exception that forwards most calls to the inner exception.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#DSException-java.lang.Exception-">DSException(Exception)</a></span> - Constructor for exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#DSException-java.lang.Throwable-">DSException(Throwable)</a></span> - Constructor for exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFlexEnum</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
@@ -775,6 +793,12 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">DSA Enum mapping.</div>
 </dd>
+<dt><a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">DSIEvent</span></a> - Interface in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">This is an empty interface, DSTopics are allowed to define events however they wish.</div>
+</dd>
+<dt><a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">DSILevels</span></a> - Interface in <a href="org/iot/dsa/logging/package-summary.html">org.iot.dsa.logging</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIMetadata</span></a> - Interface in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
 <div class="block">Nodes and values can implement this to provide meta-data about themselves.</div>
@@ -783,10 +807,26 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">All node children have corresponding DSInfo instances.</div>
 </dd>
+<dt><a href="org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSInfoTopic</span></a> - Class in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">This topic is for info related events on DSNodes.</div>
+</dd>
+<dt><a href="org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">DSInfoTopic.Event</span></a> - Enum in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">The possible events for this topic.</div>
+</dd>
 <dt><a href="org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInt</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
 <div class="block">A Java int.</div>
 </dd>
+<dt><a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSInternalErrorException</span></a> - Exception in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
+<dd>
+<div class="block">Indicates an unsupported method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSInternalErrorException.html#DSInternalErrorException--">DSInternalErrorException()</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink">DSInternalErrorException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSInternalErrorException.html#DSInternalErrorException-java.lang.String-">DSInternalErrorException(String)</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink">DSInternalErrorException</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/time/DSInterval.html" title="enum in org.iot.dsa.time"><span class="typeNameLink">DSInterval</span></a> - Enum in <a href="org/iot/dsa/time/package-summary.html">org.iot.dsa.time</a></dt>
 <dd>
 <div class="block">Enum representing periods of time.</div>
@@ -805,24 +845,10 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Super class of anything found in the node tree.</div>
 </dd>
-<dt><a href="org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSIoException</span></a> - Exception in <a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></dt>
-<dd>
-<div class="block">Unchecked IOException.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIoException.html#DSIoException-java.lang.String-">DSIoException(String)</a></span> - Constructor for exception org.iot.dsa.io.<a href="org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security"><span class="typeNameLink">DSIPassword</span></a> - Interface in <a href="org/iot/dsa/security/package-summary.html">org.iot.dsa.security</a></dt>
 <dd>
 <div class="block">Defines the api for verifying passwords.</div>
 </dd>
-<dt><a href="org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIPublisher</span></a> - Interface in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
-<dd>
-<div class="block">DSEvent producer.</div>
-</dd>
-<dt><a href="org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSIPublisher.Event</span></a> - Enum in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
-<dd>
-<div class="block">Passed to DSISubscriber onEvent to describe the event.</div>
-</dd>
 <dt><a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><span class="typeNameLink">DSIReader</span></a> - Interface in <a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></dt>
 <dd>
 <div class="block">A decoder that can be used to get an entire graph in pieces, or one large group, or somewhere in
@@ -844,9 +870,13 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Indicates something that is/has a quality.</div>
 </dd>
-<dt><a href="org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSISubscriber</span></a> - Interface in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
+<dt><a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIStorable</span></a> - Interface in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
-<div class="block">Interface for receiving events from DSIPublishers.</div>
+<div class="block">Enables custom serialization for non-node values in the configuration database.</div>
+</dd>
+<dt><a href="org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">DSISubscriber</span></a> - Interface in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">DSISubscribers subscribe to DSTopics on DSNodes.</div>
 </dd>
 <dt><a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIValue</span></a> - Interface in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
@@ -916,10 +946,9 @@ <h2 class="title">D</h2>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#DSLinkConnection--">DSLinkConnection()</a></span> - Constructor for class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConnection.Listener</span></a> - Interface in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkSession</span></a> - Interface in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
 <dd>
-<div class="block">Represents a line of communication with a remote entity.</div>
+<div class="block">Intended for requester functionality so that requesters can know when to
+ start and stop making requests.</div>
 </dd>
 <dt><a href="org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSList</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
@@ -929,7 +958,11 @@ <h2 class="title">D</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a> - Class in <a href="org/iot/dsa/logging/package-summary.html">org.iot.dsa.logging</a></dt>
 <dd>
-<div class="block">Adds a convenience layer to Java Util Logging.</div>
+<div class="block">Adds an abstraction layer on Java Util Logging for two purposes:
+
+ 
+
+ To use the DSA levels.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#DSLogger--">DSLogger()</a></span> - Constructor for class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
 <dd>&nbsp;</dd>
@@ -941,6 +974,12 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">A 64 bit integer (a Java long).</div>
 </dd>
+<dt><a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSMainNode</span></a> - Class in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
+<dd>
+<div class="block">The root DSNode that triggers a link's custom functionality .</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSMainNode.html#DSMainNode--">DSMainNode()</a></span> - Constructor for class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSMap</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
 <div class="block">String keyed collection of elements that preserves the order of addition.</div>
@@ -962,13 +1001,13 @@ <h2 class="title">D</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSNode</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
-<div class="block">The primary organization unit of the node tree.</div>
+<div class="block">The organizational unit of the node tree.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#DSNode--">DSNode()</a></span> - Constructor for class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSNull.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSNull</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
-<div class="block">This is used for decoding raw json.</div>
+<div class="block">Try not to use, it is for decoding raw json.</div>
 </dd>
 <dt><a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordAes</span></a> - Class in <a href="org/iot/dsa/security/package-summary.html">org.iot.dsa.security</a></dt>
 <dd>
@@ -992,6 +1031,8 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">Indicates a request has insufficient permissions.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSPermissionException.html#DSPermissionException--">DSPermissionException()</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink">DSPermissionException</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSPermissionException.html#DSPermissionException-java.lang.String-">DSPermissionException(String)</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink">DSPermissionException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/node/DSRegistry.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSRegistry</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
@@ -1008,12 +1049,6 @@ <h2 class="title">D</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSRequestException.html#DSRequestException-java.lang.String-">DSRequestException(String)</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">DSRequestException</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSRootNode</span></a> - Class in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
-<dd>
-<div class="block">The root DSNode that triggers a link's custom functionality .</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSRootNode.html#DSRootNode--">DSRootNode()</a></span> - Constructor for class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime</span></a> - Class in <a href="org/iot/dsa/package-summary.html">org.iot.dsa</a></dt>
 <dd>
 <div class="block">DSA thread pool and timers.</div>
@@ -1030,10 +1065,30 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">String wrapper.</div>
 </dd>
+<dt><a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSSysNode</span></a> - Class in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
+<dd>
+<div class="block">The root of the system nodes.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#DSSysNode--">DSSysNode()</a></span> - Constructor for class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time"><span class="typeNameLink">DSTime</span></a> - Class in <a href="org/iot/dsa/time/package-summary.html">org.iot.dsa.time</a></dt>
 <dd>
 <div class="block">Misc time utility functions.</div>
 </dd>
+<dt><a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSTopic</span></a> - Class in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">DSISubscribers subscribe to DSTopics on DSNodes.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSTopic.html#DSTopic--">DSTopic()</a></span> - Constructor for class org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSUnsupportedException</span></a> - Exception in <a href="org/iot/dsa/dslink/package-summary.html">org.iot.dsa.dslink</a></dt>
+<dd>
+<div class="block">Indicates an unsupported method.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSUnsupportedException.html#DSUnsupportedException--">DSUnsupportedException()</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink">DSUnsupportedException</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSUnsupportedException.html#DSUnsupportedException-java.lang.String-">DSUnsupportedException(String)</a></span> - Constructor for exception org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink">DSUnsupportedException</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/util/DSUtil.html" title="class in org.iot.dsa.util"><span class="typeNameLink">DSUtil</span></a> - Class in <a href="org/iot/dsa/util/package-summary.html">org.iot.dsa.util</a></dt>
 <dd>
 <div class="block">Common utilities.</div>
@@ -1044,6 +1099,20 @@ <h2 class="title">D</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValue.html#DSValue--">DSValue()</a></span> - Constructor for class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSValueNode</span></a> - Class in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
+<dd>
+<div class="block">A convenience implementation of a node that is also a value.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#DSValueNode--">DSValueNode()</a></span> - Constructor for class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSValueTopic</span></a> - Class in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">This topic is for change of value events on DSNodes.</div>
+</dd>
+<dt><a href="org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">DSValueTopic.Event</span></a> - Enum in <a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></dt>
+<dd>
+<div class="block">The possible events from this topic.</div>
+</dd>
 <dt><a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSValueType</span></a> - Enum in <a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></dt>
 <dd>
 <div class="block">These are the primitive types in the DSA protocol.</div>
@@ -1122,6 +1191,18 @@ <h2 class="title">E</h2>
 <dd>
 <div class="block">Encodes a name for being in a path.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#encodeNameV1-java.lang.String-java.lang.StringBuilder-">encodeNameV1(String, StringBuilder)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
+<dd>
+<div class="block">Encodes a DSA v1 name for use outside of a path.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#encodePath-boolean-java.lang.String...-">encodePath(boolean, String...)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
+<dd>
+<div class="block">Creates a properly encoded path from the given names.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#encodePath-boolean-java.lang.String:A-int-">encodePath(boolean, String[], int)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
+<dd>
+<div class="block">Creates a properly encoded path from the given names.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#encodePath-org.iot.dsa.node.DSNode-">encodePath(DSNode)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
 <dd>
 <div class="block">Ascends the tree and encodes all the node names into a path.</div>
@@ -1156,7 +1237,7 @@ <h2 class="title">E</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSUtil.html#equal-java.lang.Object-java.lang.Object-">equal(Object, Object)</a></span> - Static method in class org.iot.dsa.util.<a href="org/iot/dsa/util/DSUtil.html" title="class in org.iot.dsa.util">DSUtil</a></dt>
 <dd>
-<div class="block">Comparison that takes null into account.</div>
+<div class="block">Comparison that takes null into account; null == null.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBool.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></dt>
 <dd>&nbsp;</dd>
@@ -1226,6 +1307,20 @@ <h2 class="title">E</h2>
 <dd>
 <div class="block">True if this proxies a default and the value matches the default.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#error">error</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#error--">error()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">True if the level is loggable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">ErrorType</span></a> - Enum in <a href="org/iot/dsa/dslink/requester/package-summary.html">org.iot.dsa.dslink.requester</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:F">
 <!--   -->
@@ -1234,6 +1329,18 @@ <h2 class="title">F</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBool.html#FALSE">FALSE</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#fatal">fatal</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#fatal--">fatal()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">True if the level is loggable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#FAULT">FAULT</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
 <div class="block">Bad, an operational error (exception) has occurred within DSA.</div>
@@ -1246,6 +1353,10 @@ <h2 class="title">F</h2>
 <dd>
 <div class="block">Logs records to a file.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#FINE">FINE</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#fine">fine</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#fine--">fine()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
 <dd>
 <div class="block">True if the level is loggable.</div>
@@ -1258,29 +1369,13 @@ <h2 class="title">F</h2>
 <dd>
 <div class="block">Log a frequent event.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#finer--">finer()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>
-<div class="block">True if the level is loggable.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-">finer(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire(DSTopic, DSIEvent, DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">Log a debug event.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-java.lang.Throwable-">finer(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>
-<div class="block">Log a debug event.</div>
+<div class="block">Notifies subscribers of the event.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#finest--">finest()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire(DSTopic, DSIEvent, DSInfo, Object...)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">True if the level is loggable.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-">finest(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>
-<div class="block">Log a trace or verbose event.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-java.lang.Throwable-">finest(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>
-<div class="block">Log a trace or verbose event.</div>
+<div class="block">Notifies subscribers of the event.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSGroup.html#first--">first()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></dt>
 <dd>
@@ -1298,6 +1393,10 @@ <h2 class="title">F</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPermission.html#forString-java.lang.String-">forString(String)</a></span> - Static method in enum org.iot.dsa.security.<a href="org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#fromHex-java.lang.CharSequence-">fromHex(CharSequence)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
+<dd>
+<div class="block">Converts a hex string into a byte array.</div>
+</dd>
 </dl>
 <a name="I:G">
 <!--   -->
@@ -1381,16 +1480,14 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">The action that was invoked.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSActionValues.html#getAction--">getAction()</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#getAction--">getAction()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/FileLogHandler.html#getBackups--">getBackups()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></dt>
 <dd>
 <div class="block">Backup files for this logging, found in the same directory as the active logging.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/FileLogHandler.html#getBackupThreshold--">getBackupThreshold()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></dt>
-<dd>
-<div class="block">The size after which a logging file will be backed up and cleared.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSUtil.html#getBit-int-int-">getBit(int, int)</a></span> - Static method in class org.iot.dsa.util.<a href="org/iot/dsa/util/DSUtil.html" title="class in org.iot.dsa.util">DSUtil</a></dt>
 <dd>
 <div class="block">Returns true if the bit at the given index is set.</div>
@@ -1472,10 +1569,8 @@ <h2 class="title">G</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getConnection--">getConnection()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkSession.html#getConnection--">getConnection()</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink">DSLinkSession</a></dt>
-<dd>
-<div class="block">The associate connection.</div>
-</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#getConnection--">getConnection()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#getConnectionId--">getConnectionId()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
 <dd>
 <div class="block">A unique descriptive tag such as a combination of the link name and the broker host.</div>
@@ -1512,6 +1607,10 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Additional information to supply to the remote endpoint.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#getDisplayName--">getDisplayName()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
+<dd>
+<div class="block">The alternate display name, or null.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractReader.html#getDouble--">getDouble()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIReader.html#getDouble--">getDouble()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></dt>
@@ -1526,6 +1625,8 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Primitive getter.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getDsaVersion--">getDsaVersion()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getDsId--">getDsId()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>
 <div class="block">Returns the unique id of the connection.</div>
@@ -1548,6 +1649,10 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">A convenience that casts getObject().</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement(String)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for (DSElement) get(name).</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBool.html#getElementType--">getElementType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#getElementType--">getElementType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
@@ -1667,10 +1772,12 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">The link using this connection.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSRootNode.html#getLink--">getLink()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSMainNode.html#getLink--">getLink()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></dt>
 <dd>
 <div class="block">The parent link or null.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#getLink--">getLink()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getLinkName--">getLinkName()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>
 <div class="block">As defined in dslink.json.</div>
@@ -1694,33 +1801,29 @@ <h2 class="title">G</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#getLocalizedMessage--">getLocalizedMessage()</a></span> - Method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getLogFile--">getLogFile()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getLogger--">getLogger()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
-<dd>
-<div class="block">The logger as defined in dslink.json.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSRootNode.html#getLogger-java.lang.String-">getLogger(String)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></dt>
-<dd>
-<div class="block">Creates a child logger of the link.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#getLogger--">getLogger()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>
-<div class="block">Override point, returns the console logger by default.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogging.html#getLogger-java.lang.String-java.io.File-">getLogger(String, File)</a></span> - Static method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging">DSLogging</a></dt>
 <dd>
 <div class="block">Adds a FileLogHandler to the named logger, if there isn't one already.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#getLogger--">getLogger()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
-<dd>
-<div class="block">Ascends the tree until a logger is found.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getLogLevel--">getLogLevel()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
 <div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'info' if
  necessary.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getLogName--">getLogName()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#getLogName--">getLogName()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSMainNode.html#getLogName--">getLogName()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#getLogName--">getLogName()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#getLogName--">getLogName()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">Override point, returns the simple class name by default.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#getLogName--">getLogName()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractReader.html#getLong--">getLong()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIReader.html#getLong--">getLong()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></dt>
@@ -1735,6 +1838,12 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Primitive getter.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getMain--">getMain()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getMainType--">getMainType()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
+<dd>
+<div class="block">The type of the root node.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractReader.html#getMap--">getMap()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIReader.html#getMap--">getMap()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></dt>
@@ -1755,8 +1864,6 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">The number of backup files to retain.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/AsyncLogHandler.html#getMaxQueueSize--">getMaxQueueSize()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#getMaxValue--">getMaxValue()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>
 <div class="block">The max value, or null.</div>
@@ -1764,9 +1871,7 @@ <h2 class="title">G</h2>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#getMessage--">getMessage()</a></span> - Method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/ApiObject.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata(DSMap)</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></dt>
-<dd>
-<div class="block">Add any meta-data for the object to the given map.</div>
-</dd>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSFlexEnum.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata(DSMap)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIMetadata.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata(DSMap)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a></dt>
@@ -1777,6 +1882,10 @@ <h2 class="title">G</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSJavaEnum.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata(DSMap)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata(DSInfo, DSMap)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
+<dd>
+<div class="block">Fully acquires metadata about the info.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata(DSInfo, DSMap)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">Override point, add any meta data for the given info to the provided bucket.</div>
@@ -1807,13 +1916,9 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">A convenience for (DSNode) get(name).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getNodes--">getNodes()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
-<dd>
-<div class="block">Returns the root of the node tree.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getNodesFile--">getNodesFile()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
-<div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.json' in
+<div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.zip' in
  the process directory if necessary.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#getObject--">getObject()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
@@ -1911,9 +2016,9 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Unique ID of the request, or 0 for subscriptions.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/InboundRequest.html#getResponder--">getResponder()</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/InboundRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundRequest</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#getResult-long-">getResult(long)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
 <dd>
-<div class="block">The corresponding session.</div>
+<div class="block">Waits for the stream to close before returning, or the timeout to occur.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionSpec.html#getResultType--">getResultType()</a></span> - Method in interface org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionSpec.html" title="interface in org.iot.dsa.node.action">ActionSpec</a></dt>
 <dd>
@@ -1921,10 +2026,6 @@ <h2 class="title">G</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSAction.html#getResultType--">getResultType()</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getRootType--">getRootType()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>
-<div class="block">The type of the root node.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionTable.html#getRows--">getRows()</a></span> - Method in interface org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionTable.html" title="interface in org.iot.dsa.node.action">ActionTable</a></dt>
 <dd>
 <div class="block">This should return an iterator for the initial set of rows, or null if there aren't any.</div>
@@ -1933,6 +2034,8 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">The runnable being managed by this timer.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#getSession--">getSession()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.Signer.html#getSignature--">getSignature()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.Signer.html" title="class in org.iot.dsa.security">DSKeys.Signer</a></dt>
 <dd>
 <div class="block">The signature for all bytes passed to the update method.</div>
@@ -1973,6 +2076,10 @@ <h2 class="title">G</h2>
 <dd>
 <div class="block">Unique subscription id for this path.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#getSys--">getSys()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#getSys--">getSys()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/OutboundListResponse.html#getTarget--">getTarget()</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/OutboundListResponse.html" title="interface in org.iot.dsa.dslink.responder">OutboundListResponse</a></dt>
 <dd>
 <div class="block">The object that represents the path of the request.</div>
@@ -1985,18 +2092,12 @@ <h2 class="title">G</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/PrintStreamLogHandler.html#getThreadName--">getThreadName()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging">PrintStreamLogHandler</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#getTimeout--">getTimeout()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Number of millis the read methods will block before throwing an IOException.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#getTimeout--">getTimeout()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Number of millis the read methods will block before throwing an IOException.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#getToken--">getToken()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
 <div class="block">Authentication token for the broker, this can return null.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#getTransport--">getTransport()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#getType--">getType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>
 <div class="block">The type for action parameters, can be used to override types in the responder api.</div>
@@ -2019,6 +2120,15 @@ <h2 class="title">G</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMap.Entry.html#getValue--">getValue()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMap.Entry.html" title="class in org.iot.dsa.node">DSMap.Entry</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue(String)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for (DSIValue) get(name).</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#getValueChild--">getValueChild()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
+<dd>
+<div class="block">Subclasses must store the node value in a child value and provide the info for that child
+ here.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionSpec.html#getValueResults--">getValueResults()</a></span> - Method in interface org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionSpec.html" title="interface in org.iot.dsa.node.action">ActionSpec</a></dt>
 <dd>
 <div class="block">This is only called for the VALUES result type.</div>
@@ -2027,6 +2137,8 @@ <h2 class="title">G</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionValues.html#getValues--">getValues()</a></span> - Method in interface org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSActionValues.html#getValues--">getValues()</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBool.html#getValueType--">getValueType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#getValueType--">getValueType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
@@ -2063,6 +2175,8 @@ <h2 class="title">G</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSString.html#getValueType--">getValueType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#getValueType--">getValueType()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordAes.html#getValueType--">getValueType()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordSha256.html#getValueType--">getValueType()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></dt>
@@ -2121,6 +2235,8 @@ <h2 class="title">H</h2>
 <dd>
 <div class="block">True if there is another info after this one.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSGroup.html#hasParent--">hasParent()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/AsyncLogHandler.html#houseKeeping--">houseKeeping()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></dt>
 <dd>
 <div class="block">Subclass hook for activities such as rolling files and cleaning up old garbage.</div>
@@ -2159,6 +2275,10 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">Index of the given key, or -1.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#INFO">INFO</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#info">info</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#info--">info()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
 <dd>
 <div class="block">True if the level is loggable.</div>
@@ -2171,6 +2291,8 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">Log an infrequent major lifecycle event.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#init-org.iot.dsa.dslink.DSLinkConfig-">init(DSLinkConfig)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>
 <div class="block">Configures a link instance including creating the appropriate connection.</div>
@@ -2181,6 +2303,14 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">Only use with open tables, insert the rows at the given index.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSInfoTopic.html#INSTANCE">INSTANCE</a></span> - Static variable in class org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a></dt>
+<dd>
+<div class="block">The only instance of this topic.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSValueTopic.html#INSTANCE">INSTANCE</a></span> - Static variable in class org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></dt>
+<dd>
+<div class="block">The only instance of this topic.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSIRequester.html#invoke-java.lang.String-org.iot.dsa.node.DSMap-org.iot.dsa.dslink.requester.OutboundInvokeHandler-">invoke(String, DSMap, OutboundInvokeHandler)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink">DSIRequester</a></dt>
 <dd>
 <div class="block">Submits an invoke request.</div>
@@ -2195,6 +2325,16 @@ <h2 class="title">I</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#isAction--">isAction()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/ApiObject.html#isAdmin--">isAdmin()</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></dt>
+<dd>
+<div class="block">Whether or not this object requires configuration permission to read/write.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#isAdmin--">isAdmin()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#isAutoClose--">isAutoClose()</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">True by default, whether or not to close the stream upon receiving the first result.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isBad--">isBad()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
 <div class="block">If any of the bad flags are set, or is null.</div>
@@ -2221,22 +2361,24 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">True if CLOSED_TABLE, VOID, or VALUES.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/ApiObject.html#isConfig--">isConfig()</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></dt>
-<dd>
-<div class="block">Whether or not this object requires configuration permission to read/write.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#isConfig--">isConfig()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPermission.html#isConfig--">isConfig()</a></span> - Method in enum org.iot.dsa.security.<a href="org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isConfigFault--">isConfigFault()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
 <div class="block">True if the associate bit is set.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#isConnected--">isConnected()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">True when a connection is established with the remote endpoint.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">True if this is the default instance for the type.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#isDefaultOnCopy--">isDefaultOnCopy()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
+<dd>
+<div class="block">Whether or not the current value, or the default value is copied.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isDisabled--">isDisabled()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
 <div class="block">True if the associate bit is set.</div>
@@ -2299,6 +2441,10 @@ <h2 class="title">I</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isEqual-java.lang.Object-">isEqual(Object)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSTopic.html#isEqual-java.lang.Object-">isEqual(Object)</a></span> - Method in class org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></dt>
+<dd>
+<div class="block">Only test instance equality.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordAes.html#isEqual-java.lang.Object-">isEqual(Object)</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordSha256.html#isEqual-java.lang.Object-">isEqual(Object)</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></dt>
@@ -2315,14 +2461,6 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">True if cancelled or was a one time execution and that has finished.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#isFixedList-byte-">isFixedList(byte)</a></span> - Static method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#isFixedMap-byte-">isFixedMap(byte)</a></span> - Static method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#isFixInt-byte-">isFixInt(byte)</a></span> - Static method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#isFixStr-byte-">isFixStr(byte)</a></span> - Static method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSElement.html#isFloat--">isFloat()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></dt>
 <dd>
 <div class="block">Whether or not the object represents a float.</div>
@@ -2473,6 +2611,10 @@ <h2 class="title">I</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isNull--">isNull()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSTopic.html#isNull--">isNull()</a></span> - Method in class org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></dt>
+<dd>
+<div class="block">False</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordAes.html#isNull--">isNull()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordSha256.html#isNull--">isNull()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></dt>
@@ -2489,18 +2631,10 @@ <h2 class="title">I</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isOk--">isOk()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#isOpen--">isOpen()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
-<dd>
-<div class="block">True when a connection is established with the remote endpoint.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/InboundListRequest.html#isOpen--">isOpen()</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/InboundListRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundListRequest</a></dt>
 <dd>
 <div class="block">Whether or not the list stream is still open.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#isOpen--">isOpen()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#isOpen--">isOpen()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionInvocation.html#isOpen--">isOpen()</a></span> - Method in interface org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a></dt>
 <dd>
 <div class="block">Whether or not response is still open.</div>
@@ -2537,17 +2671,17 @@ <h2 class="title">I</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#isRemoteUnknown--">isRemoteUnknown()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#isRequester--">isRequester()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSMainNode.html#isRequester--">isRequester()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></dt>
 <dd>
-<div class="block">Looks for the isRequester config, false by default.</div>
+<div class="block">Override point, returns true by default.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#isResponder--">isResponder()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSMainNode.html#isResponder--">isResponder()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></dt>
 <dd>
-<div class="block">Looks for the isResponder config, true by default.</div>
+<div class="block">Override point, returns true by default.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/DSRuntime.Timer.html#isRunning--">isRunning()</a></span> - Method in class org.iot.dsa.<a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a></dt>
 <dd>
-<div class="block">Trun only when the runnable is actually being run.</div>
+<div class="block">True when the runnable is being actually being executed.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#isRunning--">isRunning()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
@@ -2585,6 +2719,14 @@ <h2 class="title">I</h2>
 <dd>
 <div class="block">True if there are any subscribers.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed(DSInfo, DSTopic)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">True if there are any subscriptions with the matching child and topic.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed(DSTopic)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">True if there any subscriptions for the given topic.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#isTransient--">isTransient()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
 <dd>
 <div class="block">Whether or not an object is persistent.</div>
@@ -2721,6 +2863,8 @@ <h2 class="title">J</h2>
 <dd>
 <div class="block">Will write a zip file to the given stream.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/JsonWriter.html#JsonWriter-java.io.Writer-">JsonWriter(Writer)</a></span> - Constructor for class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json">JsonWriter</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="I:K">
 <!--   -->
@@ -2761,8 +2905,14 @@ <h2 class="title">L</h2>
 <dd>
 <div class="block">The lastRun run or -1 if it hasn't run yet.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#length--">length()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#length--">length()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
+<dd>
+<div class="block">Returns 0 by default.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSIWriter.html#length--">length()</a></span> - Method in interface org.iot.dsa.io.<a href="org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></dt>
+<dd>
+<div class="block">If the writer is buffering output, this returns the size of that buffer.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#length--">length()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
 <dd>
 <div class="block">The number of bytes in the array.</div>
@@ -2816,10 +2966,21 @@ <h2 class="title">M</h2>
 <dd>
 <div class="block">Only public for testing, do not call.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/ErrorType.html#makeException-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">makeException(ErrorType, String)</a></span> - Static method in enum org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#makeMessage-java.lang.Throwable-">makeMessage(Throwable)</a></span> - Static method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
+<dd>
+<div class="block">Attempts come up with the best description of the argument.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSElement.html#makeNull--">makeNull()</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></dt>
 <dd>
 <div class="block">Creates an DSIObject representation of null.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#makeRuntime-java.lang.Throwable-">makeRuntime(Throwable)</a></span> - Static method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
+<dd>
+<div class="block">If the given exception is already a runtime exception, it is cast and returned,
+ otherwise it will be returned wrapped by an instance of this class.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMap.html#map">map</a></span> - Variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#MAX_VALUE">MAX_VALUE</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
@@ -2872,19 +3033,9 @@ <h2 class="title">M</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSTime.html#MILLIS_YEAR">MILLIS_YEAR</a></span> - Static variable in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#MIN_VALUE">MIN_VALUE</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">MsgpackReader</span></a> - Class in <a href="org/iot/dsa/io/msgpack/package-summary.html">org.iot.dsa.io.msgpack</a></dt>
-<dd>
-<div class="block">MsgPack implementation of DSReader.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#MsgpackReader--">MsgpackReader()</a></span> - Constructor for class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#MsgpackReader-java.io.InputStream-">MsgpackReader(InputStream)</a></span> - Constructor for class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSTime.html#millisToNanos-long-">millisToNanos(long)</a></span> - Static method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">MsgpackWriter</span></a> - Class in <a href="org/iot/dsa/io/msgpack/package-summary.html">org.iot.dsa.io.msgpack</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#MsgpackWriter--">MsgpackWriter()</a></span> - Constructor for class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#MIN_VALUE">MIN_VALUE</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <a name="I:N">
@@ -2898,6 +3049,8 @@ <h2 class="title">N</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSTime.html#NANOS_IN_SEC">NANOS_IN_SEC</a></span> - Static variable in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSTime.html#nanosToMillis-long-">nanosToMillis(long)</a></span> - Static method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time">DSTime</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.html#newKeyPair--">newKeyPair()</a></span> - Static method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a></dt>
 <dd>
 <div class="block">Creates a key pair for the predefined elliptic curve secp256r1.</div>
@@ -2925,8 +3078,6 @@ <h2 class="title">N</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/JsonReader.html#next--">next()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json">JsonReader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#next--">next()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#next--">next()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
 <dd>
 <div class="block">The next info in the parent node.</div>
@@ -2951,10 +3102,6 @@ <h2 class="title">N</h2>
 <dd>
 <div class="block">The next DSInfo in the parent that is a value, or null.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#nodeChanged--">nodeChanged()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
-<dd>
-<div class="block">Fires a publisher changed event for this node.</div>
-</dd>
 <dt><a href="org/iot/dsa/io/NodeDecoder.html" title="class in org.iot.dsa.io"><span class="typeNameLink">NodeDecoder</span></a> - Class in <a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></dt>
 <dd>
 <div class="block">Decodes a node (tree) that was encoded with NodeEncoder.</div>
@@ -2997,6 +3144,8 @@ <h2 class="title">N</h2>
 </a>
 <h2 class="title">O</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#off">off</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#OK">OK</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>
 <div class="block">Good, no other status applies.</div>
@@ -3029,18 +3178,22 @@ <h2 class="title">O</h2>
 <dd>
 <div class="block">Called when the given child is changed and in the stable state.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved(DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged(DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
 <dd>
-<div class="block">Called when the given child is removed and in the stable state.</div>
+<div class="block">This fires the NODE_CHANGED topic when the value child changes.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#onClose--">onClose()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved(DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">Called the when network connection has been closed.</div>
+<div class="block">Called when the given child is removed and in the stable state.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose()</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></dt>
 <dd>
 <div class="block">Callback for when the request stream is closed, no matter how or by who.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onClose--">onClose()</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Causes getResult to return.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html#onClose--">onClose()</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></dt>
 <dd>
 <div class="block">Does nothing by default.</div>
@@ -3057,32 +3210,50 @@ <h2 class="title">O</h2>
 <dd>
 <div class="block">Always called, whether or not the result is a stream, and no matter who closes it.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSActionValues.html#onClose--">onClose()</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dt>
+<dd>
+<div class="block">Does nothing.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html#onColumns-org.iot.dsa.node.DSList-">onColumns(DSList)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a></dt>
 <dd>
 <div class="block">Called whenever columns are received.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onColumns-org.iot.dsa.node.DSList-">onColumns(DSList)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Does nothing.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html#onConnect-org.iot.dsa.dslink.DSLinkConnection-">onConnect(DSLinkConnection)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a></dt>
 <dd>
-<div class="block">Called when the connection with the endpoint is closed.</div>
+<div class="block">Called asynchronously after the connection with the endpoint is opened.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#onConnect--">onConnect()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">Called after onInitialize and before onRun.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html#onDisconnect-org.iot.dsa.dslink.DSLinkConnection-">onDisconnect(DSLinkConnection)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a></dt>
 <dd>
-<div class="block">Called when the connection with the endpoint is established.</div>
+<div class="block">Called synchronously after the connection with the endpoint is closed.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError(String, String, String)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#onDisconnect--">onDisconnect()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">Called when this network connection has been closed.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError(ErrorType, String)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></dt>
 <dd>
 <div class="block">Callback for when an error is received.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError(String, String, String)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError(ErrorType, String)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Will create an exception to be thrown by getResult.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError(ErrorType, String)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></dt>
 <dd>
 <div class="block">Does nothing by default.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">onEvent(DSIObject, DSInfo, DSIPublisher.Event)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSISubscriber.html#onEvent-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-java.lang.Object...-">onEvent(DSTopic, DSIEvent, DSNode, DSInfo, Object...)</a></span> - Method in interface org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a></dt>
 <dd>
-<div class="block">Routes events from child DSIPublishers to onChildChanged in the parent.</div>
+<div class="block">Subscription callback.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSISubscriber.html#onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">onEvent(DSIObject, DSInfo, DSIPublisher.Event)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged(DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">Called when the given info is modified and in the stable state.</div>
@@ -3111,6 +3282,10 @@ <h2 class="title">O</h2>
 <dd>
 <div class="block">Called by the requester before returning from the subscribe method.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#onInitialize--">onInitialize()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">Always called before onConnect.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundListHandler.html#onInitialized--">onInitialized()</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundListHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundListHandler</a></dt>
 <dd>
 <div class="block">Called once the initial state of the target has been transmitted.</div>
@@ -3119,19 +3294,17 @@ <h2 class="title">O</h2>
 <dd>
 <div class="block">Called when the given rows should be inserted at the given index.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onInsert-int-org.iot.dsa.node.DSList-">onInsert(int, DSList)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Will result in an error since tables and streams are not supported.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSIResponder.html#onInvoke-org.iot.dsa.dslink.responder.InboundInvokeRequest-">onInvoke(InboundInvokeRequest)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></dt>
 <dd>
 <div class="block">The implementation should quickly create an object for responding to the request, but do no
  processing of it on the calling thread.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke(DSInfo, ActionInvocation)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
-<dd>
-<div class="block">Handles the save action.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#onInvoke-org.iot.dsa.dslink.responder.InboundInvokeRequest-">onInvoke(InboundInvokeRequest)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
-<dd>
-<div class="block">Responder implementation.</div>
-</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke(DSInfo, ActionInvocation)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke(DSInfo, ActionInvocation)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">Override point, called by the default implementation of DSAction.invoke.</div>
@@ -3141,14 +3314,14 @@ <h2 class="title">O</h2>
 <div class="block">The implementation should quickly create an object for responding to the request, but do no
  processing of it on the calling thread.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#onList-org.iot.dsa.dslink.responder.InboundListRequest-">onList(InboundListRequest)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
-<dd>
-<div class="block">Responder implementation.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html#onMode-org.iot.dsa.dslink.requester.OutboundInvokeHandler.Mode-">onMode(OutboundInvokeHandler.Mode)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a></dt>
 <dd>
 <div class="block">Called whenever a mode is received.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onMode-org.iot.dsa.dslink.requester.OutboundInvokeHandler.Mode-">onMode(OutboundInvokeHandler.Mode)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Does nothing.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundListHandler.html#onRemove-java.lang.String-">onRemove(String)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundListHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundListHandler</a></dt>
 <dd>
 <div class="block">Only called after onOpen(), indicates something about the target of the request has been
@@ -3159,13 +3332,17 @@ <h2 class="title">O</h2>
 <div class="block">The rows starting and ending with the given indexes should be removed and the given rows
  inserted at the start index.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSIResponder.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-">onSet(InboundSetRequest)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onReplace-int-int-org.iot.dsa.node.DSList-">onReplace(int, int, DSList)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
 <dd>
-<div class="block">The implementation should do no processing of it on the calling thread.</div>
+<div class="block">Will result in an error since tables and streams are not supported.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#onRun--">onRun()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">The long term management of the connection (reading and writing).</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-">onSet(InboundSetRequest)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSIResponder.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-">onSet(InboundSetRequest)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></dt>
 <dd>
-<div class="block">Responder implementation.</div>
+<div class="block">The implementation should do no processing of it on the calling thread.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet(DSInfo, DSIValue)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
@@ -3175,6 +3352,12 @@ <h2 class="title">O</h2>
 <dd>
 <div class="block">Override point, called only when a DSNode subclass implements DSIValue is being set.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet(DSIValue)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConnection.html#onStable--">onStable()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></dt>
+<dd>
+<div class="block">Starts the connection.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onStable--">onStable()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">Called once this node is stable, but before stable is called on children.</div>
@@ -3194,21 +3377,42 @@ <h2 class="title">O</h2>
 <div class="block">The implementation should quickly create an object for responding to the request, but do no
  processing of it on the calling thread.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#onSubscribe-org.iot.dsa.dslink.responder.InboundSubscribeRequest-">onSubscribe(InboundSubscribeRequest)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe(DSTopic, DSInfo, DSISubscriber)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">Responder implementation.</div>
+<div class="block">Called for every subscription.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">Called when this node transitions from unsubscribed to subscribed.</div>
+<div class="block">Called when this node transitions from having no subscriptions to having a subscription of
+ any kind.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed(DSTopic, DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">Called when the child and topic pair transitions from having no subscriptions to have a
+ subscription.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html#onTableMeta-org.iot.dsa.node.DSMap-">onTableMeta(DSMap)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a></dt>
 <dd>
 <div class="block">Called whenever metadata for the entire table is received.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onTableMeta-org.iot.dsa.node.DSMap-">onTableMeta(DSMap)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe(DSTopic, DSInfo, DSISubscriber)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">Called for every unsubscribe.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">Called when this node transitions from subscribed to unsubscribed.</div>
+<div class="block">Called when this node transitions to having no subscriptions of any kind.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed(DSTopic, DSInfo)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">Called when the child and topic pair transitions to having no subscriptions.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSISubscriber.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-">onUnsubscribed(DSTopic, DSNode, DSInfo)</a></span> - Method in interface org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a></dt>
+<dd>
+<div class="block">Called no matter how the unsubscribe happens, whether explicitly or if the node
+ unsubscribes itself.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html#onUpdate-org.iot.dsa.node.DSList-">onUpdate(DSList)</a></span> - Method in interface org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a></dt>
 <dd>
@@ -3222,10 +3426,10 @@ <h2 class="title">O</h2>
 <dd>
 <div class="block">Subscription update mechanism.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#open--">open()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#open--">open()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onUpdate-org.iot.dsa.node.DSList-">onUpdate(DSList)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Captures the result and if auto-close is true, closes the stream.</div>
+</dd>
 <dt><a href="org/iot/dsa/package-summary.html">org.iot.dsa</a> - package org.iot.dsa</dt>
 <dd>
 <div class="block">Use the DSRuntime thread pool and timers.</div>
@@ -3243,11 +3447,11 @@ <h2 class="title">O</h2>
 <div class="block">API for implementing responders without having modeling everything in the node tree.</div>
 </dd>
 <dt><a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a> - package org.iot.dsa.io</dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Node serialization and streaming abstraction for JSON and MsgPack.</div>
+</dd>
 <dt><a href="org/iot/dsa/io/json/package-summary.html">org.iot.dsa.io.json</a> - package org.iot.dsa.io.json</dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/iot/dsa/io/msgpack/package-summary.html">org.iot.dsa.io.msgpack</a> - package org.iot.dsa.io.msgpack</dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/logging/package-summary.html">org.iot.dsa.logging</a> - package org.iot.dsa.logging</dt>
 <dd>
 <div class="block">Async handler for Java Util Logging that also manages log backups.</div>
@@ -3258,6 +3462,8 @@ <h2 class="title">O</h2>
 </dd>
 <dt><a href="org/iot/dsa/node/action/package-summary.html">org.iot.dsa.node.action</a> - package org.iot.dsa.node.action</dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a> - package org.iot.dsa.node.event</dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/security/package-summary.html">org.iot.dsa.security</a> - package org.iot.dsa.security</dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/time/package-summary.html">org.iot.dsa.time</a> - package org.iot.dsa.time</dt>
@@ -3302,6 +3508,10 @@ <h2 class="title">P</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#PLACEHOLDER">PLACEHOLDER</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSAction.html#prepareParameter-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">prepareParameter(DSInfo, DSMap)</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></dt>
+<dd>
+<div class="block">Override point, called for each parameter as it is being sent to the requester.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#prettyPrint">prettyPrint</a></span> - Variable in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Subclasses can use this if applicable.</div>
@@ -3322,38 +3532,6 @@ <h2 class="title">P</h2>
 <dd>
 <div class="block">Enqueues the record for the write thread.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#put-byte-">put(byte)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Add the byte to the buffer for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#put-byte:A-">put(byte[])</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Add bytes to the buffer for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#put-byte:A-int-int-">put(byte[], int, int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Add bytes to the buffer for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#put-int-byte:A-int-int-">put(int, byte[], int, int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Overwrite bytes in the internal buffer (which begins at index 0).</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#put-char-">put(char)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Add the char to the buffer for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#put-char:A-">put(char[])</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Add chars to the buffer for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#put-char:A-int-int-">put(char[], int, int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Add chars to the buffer for reading.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#put-java.lang.String-">put(String)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Add chars to the buffer for reading.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSList.html#put-int-org.iot.dsa.node.DSElement-">put(int, DSElement)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a></dt>
 <dd>
 <div class="block">Replaces a value and returns this.</div>
@@ -3410,6 +3588,30 @@ <h2 class="title">P</h2>
 <dd>
 <div class="block">Adds or replaces the named child.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put(String, boolean)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put(String, double)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put(String, float)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put(String, int)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put(String, long)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put(String, String)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put(DSInfo, DSIObject)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">Replaces the child.</div>
@@ -3436,22 +3638,6 @@ <h2 class="title">P</h2>
 </a>
 <h2 class="title">R</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#read--">read()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Returns the nextRun incoming byte, or -1 when end of stream has been reached.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#read-byte:A-int-int-">read(byte[], int, int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Reads incoming bytes into the given buffer.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#read--">read()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Returns the next incoming char, or -1 when end of stream has been reached.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#read-char:A-int-int-">read(char[], int, int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
-<dd>
-<div class="block">Reads incoming chars into the given buffer.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#readDouble-byte:A-int-boolean-">readDouble(byte[], int, boolean)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
 <dd>
 <div class="block">Reads the primitive from a byte array.</div>
@@ -3607,8 +3793,6 @@ <h2 class="title">R</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/JsonWriter.html#reset--">reset()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json">JsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#reset--">reset()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.Signer.html#reset--">reset()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.Signer.html" title="class in org.iot.dsa.security">DSKeys.Signer</a></dt>
 <dd>
 <div class="block">Call to begin a new signature.</div>
@@ -3619,7 +3803,7 @@ <h2 class="title">R</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSFlexEnum.html#restore-org.iot.dsa.node.DSElement-">restore(DSElement)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore(DSElement)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore(DSElement)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></dt>
 <dd>
 <div class="block">Deserialize a value from the configuration database, these will be values returned from the
  store() method.</div>
@@ -3628,10 +3812,6 @@ <h2 class="title">R</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#restore-org.iot.dsa.node.DSElement-">restore(DSElement)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore(DSElement)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></dt>
-<dd>
-<div class="block">Calls valueOf(arg).</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.html#restore-java.io.File-">restore(File)</a></span> - Static method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a></dt>
 <dd>
 <div class="block">Decodes a key pair that was encoded by the store method.</div>
@@ -3656,6 +3836,10 @@ <h2 class="title">R</h2>
 <dd>
 <div class="block">Run periodically starting at the given time and repeat at the given millisecond interval.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/DSRuntime.Timer.html#run--">run()</a></span> - Method in class org.iot.dsa.<a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a></dt>
+<dd>
+<div class="block">Do not call.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/DSRuntime.html#runAt-java.lang.Runnable-long-">runAt(Runnable, long)</a></span> - Static method in class org.iot.dsa.<a href="org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa">DSRuntime</a></dt>
 <dd>
 <div class="block">Run once at the given time.</div>
@@ -3690,6 +3874,12 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Set arbitrary keys.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#setAdmin-boolean-">setAdmin(boolean)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#setAutoClose-boolean-">setAutoClose(boolean)</a></span> - Method in class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>
+<div class="block">Whether or not to auto close the stream on the first update.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/FileLogHandler.html#setBackupThreshold-int-">setBackupThreshold(int)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></dt>
 <dd>
 <div class="block">The file size threshold after which a logging file will be backed up and cleared.</div>
@@ -3732,8 +3922,6 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Modifies the in-memory representation of dslink.json, but it will not be saved back to disk.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#setConfig-boolean-">setConfig(boolean)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#setDecimalPlaces-org.iot.dsa.node.DSLong-">setDecimalPlaces(DSLong)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#setDefault-org.iot.dsa.node.DSIValue-">setDefault(DSIValue)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
@@ -3752,6 +3940,8 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Overrides the default detail which is the stack trace of this exception.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#setDisplayName-java.lang.String-">setDisplayName(String)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setDslinkJson-org.iot.dsa.node.DSMap-">setDslinkJson(DSMap)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
 <div class="block">Directly set the map without using file io.</div>
@@ -3772,7 +3962,11 @@ <h2 class="title">S</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#setEnumRange-org.iot.dsa.node.DSList-">setEnumRange(DSList)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>
-<div class="block">See the EDITOR_ constants.</div>
+<div class="block">List of string values for an enum or string.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#setEnumRange-java.lang.String...-">setEnumRange(String...)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
+<dd>
+<div class="block">List of string values for an enum or string.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#setHidden-boolean-">setHidden(boolean)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
 <dd>&nbsp;</dd>
@@ -3792,10 +3986,6 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Sets the input source, resets to ROOT, and returns this.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackReader.html#setInput-java.io.InputStream-">setInput(InputStream)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dt>
-<dd>
-<div class="block">Sets the input source, resets to ROOT, and returns this.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setKeys-org.iot.dsa.security.DSKeys-">setKeys(DSKeys)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
 <div class="block">Directly set the keys without using file io.</div>
@@ -3808,10 +3998,6 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Overrides dslink.json.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setLogFile-java.io.File-">setLogFile(File)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>
-<div class="block">Overrides dslink.json.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setLogLevel-java.lang.String-">setLogLevel(String)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
 <div class="block">Should be one of the following (case insensitive): all, finest, finer, fine, config, info,
@@ -3821,6 +4007,10 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Overrides dslink.json.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setMainType-java.lang.Class-">setMainType(Class)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
+<dd>
+<div class="block">The type of the root node.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSMetadata.html#setMap-org.iot.dsa.node.DSMap-">setMap(DSMap)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></dt>
 <dd>
 <div class="block">Change the underlying map so the metadata instance can be reused.</div>
@@ -3853,7 +4043,7 @@ <h2 class="title">S</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractReader.html#setNextValueNull--">setNextValueNull()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#setNodes-org.iot.dsa.dslink.DSRootNode-">setNodes(DSRootNode)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#setNodes-org.iot.dsa.dslink.DSMainNode-">setNodes(DSMainNode)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setNodesFile-java.io.File-">setNodesFile(File)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
@@ -3915,33 +4105,18 @@ <h2 class="title">S</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSInfo.html#setReadOnly-boolean-">setReadOnly(boolean)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setRequester-boolean-">setRequester(boolean)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>
-<div class="block">Overrides dslink.json.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setResponder-boolean-">setResponder(boolean)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>
-<div class="block">Overrides dslink.json.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/DSAction.html#setResultType-org.iot.dsa.node.action.ActionSpec.ResultType-">setResultType(ActionSpec.ResultType)</a></span> - Method in class org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></dt>
 <dd>
 <div class="block">Returns this, it is not necessary to set the result to void.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setRootType-java.lang.Class-">setRootType(Class)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
-<dd>
-<div class="block">The type of the root node.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#setSaveEnabled-boolean-">setSaveEnabled(boolean)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>
 <div class="block">This is a transient option intended for unit tests.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#setTimeout-long-">setTimeout(long)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Number of millis the read methods will block before throwing an DSIoException.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSCharBuffer.html#setTimeout-long-">setTimeout(long)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/DSRuntime.Timer.html#setSkipMissedIntervals-boolean-">setSkipMissedIntervals(boolean)</a></span> - Method in class org.iot.dsa.<a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a></dt>
 <dd>
-<div class="block">Number of millis the read methods will block before throwing an DSIoException.</div>
+<div class="block">The default is true, set this to false if all intervals should be run, even if they run
+ later than scheduled.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkConfig.html#setToken-java.lang.String-">setToken(String)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></dt>
 <dd>
@@ -3961,22 +4136,9 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">The unit identifier.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#severe--">severe()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>
-<div class="block">True if the level is loggable.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-">severe(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-java.lang.Throwable-">severe(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSPath.html#shouldEncode-int-">shouldEncode(int)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node">DSPath</a></dt>
-<dd>
-<div class="block">Returns true for characters that should be encoded.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLinkSession.html#shouldEndMessage--">shouldEndMessage()</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink">DSLinkSession</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSLink.html#shutdown--">shutdown()</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dt>
 <dd>
-<div class="block">Large outbound messages that can be broken into smaller ones should check this occasionally
- when writing.</div>
+<div class="block">Properly shuts down the link when a thread is executing the run method.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.html#sign-byte:A-int-int-">sign(byte[], int, int)</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a></dt>
 <dd>
@@ -3984,6 +4146,12 @@ <h2 class="title">S</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.Signer.html#Signer-java.security.PrivateKey-">Signer(PrivateKey)</a></span> - Constructor for class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.Signer.html" title="class in org.iot.dsa.security">DSKeys.Signer</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">SimpleInvokeHandler</span></a> - Class in <a href="org/iot/dsa/dslink/requester/package-summary.html">org.iot.dsa.dslink.requester</a></dt>
+<dd>
+<div class="block">Action handler for non-tables/streams.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#SimpleInvokeHandler--">SimpleInvokeHandler()</a></span> - Constructor for class org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">SimpleRequestHandler</span></a> - Class in <a href="org/iot/dsa/dslink/requester/package-summary.html">org.iot.dsa.dslink.requester</a></dt>
 <dd>
 <div class="block">Empty callback implementations.</div>
@@ -4029,7 +4197,7 @@ <h2 class="title">S</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSFlexEnum.html#store--">store()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIValue.html#store--">store()</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIStorable.html#store--">store()</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></dt>
 <dd>
 <div class="block">Serialize the value for the configuration database.</div>
 </dd>
@@ -4037,10 +4205,6 @@ <h2 class="title">S</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#store--">store()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValue.html#store--">store()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></dt>
-<dd>
-<div class="block">Calls toElement()</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSKeys.html#store-java.io.File-">store(File)</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a></dt>
 <dd>
 <div class="block">Write the bytes from the string encoding to the given file.</div>
@@ -4049,18 +4213,17 @@ <h2 class="title">S</h2>
 <dd>
 <div class="block">Writes the bytes from the string encoding to the given stream, does not onClose the stream.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordAes.html#store--">store()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordSha256.html#store--">store()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSIRequester.html#subscribe-java.lang.String-int-org.iot.dsa.dslink.requester.OutboundSubscribeHandler-">subscribe(String, int, OutboundSubscribeHandler)</a></span> - Method in interface org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink">DSIRequester</a></dt>
 <dd>
 <div class="block">Submits a subscribe request.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIPublisher.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe(DSISubscriber)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node">DSIPublisher</a></dt>
-<dd>
-<div class="block">Subscribes the argument, has no effect if the argument is already subscribed.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe(DSISubscriber)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe(DSTopic, DSInfo, DSISubscriber)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">There can be multiple subscribers but will only call onSubscribed when the node transitions
- from unsubscribed to subscribed.</div>
+<div class="block">Subscribes the child and topic.</div>
 </dd>
 <dt><a href="org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html" title="interface in org.iot.dsa.dslink.responder"><span class="typeNameLink">SubscriptionCloseHandler</span></a> - Interface in <a href="org/iot/dsa/dslink/responder/package-summary.html">org.iot.dsa.dslink.responder</a></dt>
 <dd>
@@ -4073,10 +4236,10 @@ <h2 class="title">S</h2>
 </a>
 <h2 class="title">T</h2>
 <dl>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#throwRuntime-java.lang.Exception-">throwRuntime(Exception)</a></span> - Static method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#throwRuntime-java.lang.Throwable-">throwRuntime(Throwable)</a></span> - Static method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
 <dd>
-<div class="block">If the given exception is already a runtime exception, it is rethrown, otherwise it will be
- thrown wrapped by an instance of this class.</div>
+<div class="block">If the given exception is already a runtime exception, it is rethrown, otherwise
+ it will be thrown wrapped by an instance of this class.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSDateTime.html#timeInMillis--">timeInMillis()</a></span> - Method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a></dt>
 <dd>
@@ -4096,10 +4259,6 @@ <h2 class="title">T</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSString.html#toBoolean--">toBoolean()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/DSByteBuffer.html#toByteArray--">toByteArray()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></dt>
-<dd>
-<div class="block">Returns a new array.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#toBytes--">toBytes()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSElement.html#toBytes--">toBytes()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></dt>
@@ -4153,6 +4312,8 @@ <h2 class="title">T</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#toElement--">toElement()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#toElement--">toElement()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordAes.html#toElement--">toElement()</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></dt>
 <dd>
 <div class="block">Returns a string representing the url safe base64 encoding of the hash.</div>
@@ -4193,6 +4354,14 @@ <h2 class="title">T</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSGroup.html#toGroup--">toGroup()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#toHex-byte-java.lang.StringBuilder-">toHex(byte, StringBuilder)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
+<dd>
+<div class="block">Converts the bytes into a hex string.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#toHex-byte:A-java.lang.StringBuilder-">toHex(byte[], StringBuilder)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
+<dd>
+<div class="block">Converts the bytes into a hex string.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBool.html#toInt--">toInt()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></dt>
 <dd>
 <div class="block">0 or 1.</div>
@@ -4265,6 +4434,8 @@ <h2 class="title">T</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#toStatus--">toStatus()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/DSRuntime.Timer.html#toString--">toString()</a></span> - Method in class org.iot.dsa.<a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/action/ActionSpec.ResultType.html#toString--">toString()</a></span> - Method in enum org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionSpec.ResultType.html" title="enum in org.iot.dsa.node.action">ActionSpec.ResultType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBool.html#toString--">toString()</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a></dt>
@@ -4317,6 +4488,22 @@ <h2 class="title">T</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/util/DSException.html#toString--">toString()</a></span> - Method in exception org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#trace">trace</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#trace--">trace()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">True if the level is loggable.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace(Object)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">Log a trace or verbose event.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace(Object, Throwable)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
+<dd>
+<div class="block">Log a trace or verbose event.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/FileLogHandler.html#trimBackups--">trimBackups()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></dt>
 <dd>
 <div class="block">Only public for testing, do not call.</div>
@@ -4341,14 +4528,9 @@ <h2 class="title">U</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSStatus.html#UNKNOWN_STR">UNKNOWN_STR</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIPublisher.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe(DSISubscriber)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node">DSIPublisher</a></dt>
-<dd>
-<div class="block">Unsubscribes the argument, has no effect if the argument is not currently subscribed.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe(DSISubscriber)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe(DSTopic, DSInfo, DSISubscriber)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
-<div class="block">There can be multiple subscribers but this will only call onUnsubscribed when the node
- transitions from subscribed to unsubscribed.</div>
+<div class="block">Unsubscribes the tuple.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/responder/InboundSubscribeRequest.html#update-long-org.iot.dsa.node.DSIValue-org.iot.dsa.node.DSStatus-">update(long, DSIValue, DSStatus)</a></span> - Method in interface org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/InboundSubscribeRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundSubscribeRequest</a></dt>
 <dd>
@@ -4398,10 +4580,12 @@ <h2 class="title">V</h2>
 <dd>
 <div class="block">Override point, throw a meaningful IllegalArgumentException if the child is not allowed</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSRootNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent(DSNode)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSMainNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent(DSNode)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></dt>
 <dd>
 <div class="block">The parent must be a DSLink instance.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/DSSysNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent(DSNode)</a></span> - Method in class org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent(DSNode)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
 <dd>
 <div class="block">Override point, throw a meaningful IllegalArgumentException if the parent is not allowed</div>
@@ -4456,6 +4640,12 @@ <h2 class="title">V</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#value-org.iot.dsa.node.DSElement-">value(DSElement)</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></span> - Static variable in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/ErrorType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester">OutboundInvokeHandler.Mode</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -4534,10 +4724,6 @@ <h2 class="title">V</h2>
 <dd>
 <div class="block">Checks for null, then uses Float.parseFloat()</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIPublisher.Event.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.iot.dsa.node.<a href="org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a></dt>
-<dd>
-<div class="block">Returns the enum constant of this type with the specified name.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIValue.html#valueOf-org.iot.dsa.node.DSElement-">valueOf(DSElement)</a></span> - Method in interface org.iot.dsa.node.<a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dt>
 <dd>
 <div class="block">This should convert an element transmitted over DSA, such as subscription updates or set
@@ -4587,10 +4773,20 @@ <h2 class="title">V</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSString.html#valueOf-java.lang.Object-">valueOf(Object)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueNode.html#valueOf-org.iot.dsa.node.DSElement-">valueOf(DSElement)</a></span> - Method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueType.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSInfoTopic.Event.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSValueTopic.Event.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPasswordAes.html#valueOf-org.iot.dsa.node.DSElement-">valueOf(DSElement)</a></span> - Method in class org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></dt>
 <dd>
 <div class="block">Creates a encrypted password for the given clear text.</div>
@@ -4611,6 +4807,8 @@ <h2 class="title">V</h2>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/security/DSPermission.html#valueOf-int-">valueOf(int)</a></span> - Static method in enum org.iot.dsa.security.<a href="org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSDateTime.html#valueOf-org.iot.dsa.node.DSElement-">valueOf(DSElement)</a></span> - Method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/time/DSDateTime.html#valueOf-long-">valueOf(long)</a></span> - Static method in class org.iot.dsa.time.<a href="org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a></dt>
@@ -4623,6 +4821,11 @@ <h2 class="title">V</h2>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/ErrorType.html#values--">values()</a></span> - Static method in enum org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html#values--">values()</a></span> - Static method in enum org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester">OutboundInvokeHandler.Mode</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
@@ -4643,12 +4846,17 @@ <h2 class="title">V</h2>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSIPublisher.Event.html#values--">values()</a></span> - Static method in enum org.iot.dsa.node.<a href="org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueType.html#values--">values()</a></span> - Static method in enum org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSValueType.html#values--">values()</a></span> - Static method in enum org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSInfoTopic.Event.html#values--">values()</a></span> - Static method in enum org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/node/event/DSValueTopic.Event.html#values--">values()</a></span> - Static method in enum org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
@@ -4675,6 +4883,10 @@ <h2 class="title">V</h2>
 </a>
 <h2 class="title">W</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSILevels.html#warn">warn</a></span> - Static variable in interface org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/DSLogger.html#warn--">warn()</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></dt>
 <dd>
 <div class="block">True if the level is loggable.</div>
@@ -4715,14 +4927,6 @@ <h2 class="title">W</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#write-long-">write(long)</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#write-boolean-">write(boolean)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#write-byte:A-">write(byte[])</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#write-double-">write(double)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#write-long-">write(long)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/logging/AsyncLogHandler.html#write-java.util.logging.LogRecord-">write(LogRecord)</a></span> - Method in class org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></dt>
 <dd>
 <div class="block">Formats and writes the logging record the underlying stream.</div>
@@ -4757,36 +4961,24 @@ <h2 class="title">W</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeKey-java.lang.CharSequence-">writeKey(CharSequence)</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeKey-java.lang.CharSequence-">writeKey(CharSequence)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Separate the key from the value in a map.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeListEnd--">writeListEnd()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">End the current list.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeListEnd--">writeListEnd()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeListEnd--">writeListEnd()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeListStart--">writeListStart()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeListStart-int-">writeListStart(int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Start a new list.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart--">writeListStart()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart-int-">writeListStart(int)</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeListStart--">writeListStart()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeListStart-int-">writeListStart(int)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>
-<div class="block">A negative size implies dynamic and will be written when the list is closed.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#writeLong-long-byte:A-int-boolean-">writeLong(long, byte[], int, boolean)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
 <dd>
 <div class="block">Encodes the primitive into a byte array.</div>
@@ -4801,20 +4993,12 @@ <h2 class="title">W</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapEnd--">writeMapEnd()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeMapEnd--">writeMapEnd()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeMapStart--">writeMapStart()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeMapStart-int-">writeMapStart(int)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Start a new map.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart--">writeMapStart()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
+<dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart-int-">writeMapStart(int)</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeMapStart--">writeMapStart()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeMapStart-int-">writeMapStart(int)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>
-<div class="block">A negative size implies dynamic and will be written when the map is closed.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeNewLineIndent--">writeNewLineIndent()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Override point for subclasses which perform use pretty printing, such as json.</div>
@@ -4823,24 +5007,18 @@ <h2 class="title">W</h2>
 <dd>
 <div class="block">Two spaces per level.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeNewLineIndent--">writeNewLineIndent()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeNull--">writeNull()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Write a null value.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeNull--">writeNull()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeNull--">writeNull()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeSeparator--">writeSeparator()</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Write a value separator, such as the comma in json.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeSeparator--">writeSeparator()</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeSeparator--">writeSeparator()</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/node/DSBytes.html#writeShort-short-byte:A-int-boolean-">writeShort(short, byte[], int, boolean)</a></span> - Static method in class org.iot.dsa.node.<a href="org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></dt>
 <dd>
 <div class="block">Encodes the primitive into a byte array.</div>
@@ -4849,22 +5027,12 @@ <h2 class="title">W</h2>
 <dd>
 <div class="block">Encodes the primitive into a stream.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeTo-java.nio.ByteBuffer-">writeTo(ByteBuffer)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>
-<div class="block">Writes the internal buffer to the parameter.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeTo-java.io.OutputStream-">writeTo(OutputStream)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>
-<div class="block">Writes the internal buffer to the parameter.</div>
-</dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/AbstractWriter.html#writeValue-java.lang.CharSequence-">writeValue(CharSequence)</a></span> - Method in class org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></dt>
 <dd>
 <div class="block">Write the value, which will never be null.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/iot/dsa/io/json/AbstractJsonWriter.html#writeValue-java.lang.CharSequence-">writeValue(CharSequence)</a></span> - Method in class org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/iot/dsa/io/msgpack/MsgpackWriter.html#writeValue-java.lang.CharSequence-">writeValue(CharSequence)</a></span> - Method in class org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dt>
-<dd>&nbsp;</dd>
 </dl>
 <a href="#I:A">A</a>&nbsp;<a href="#I:B">B</a>&nbsp;<a href="#I:C">C</a>&nbsp;<a href="#I:D">D</a>&nbsp;<a href="#I:E">E</a>&nbsp;<a href="#I:F">F</a>&nbsp;<a href="#I:G">G</a>&nbsp;<a href="#I:H">H</a>&nbsp;<a href="#I:I">I</a>&nbsp;<a href="#I:J">J</a>&nbsp;<a href="#I:K">K</a>&nbsp;<a href="#I:L">L</a>&nbsp;<a href="#I:M">M</a>&nbsp;<a href="#I:N">N</a>&nbsp;<a href="#I:O">O</a>&nbsp;<a href="#I:P">P</a>&nbsp;<a href="#I:R">R</a>&nbsp;<a href="#I:S">S</a>&nbsp;<a href="#I:T">T</a>&nbsp;<a href="#I:U">U</a>&nbsp;<a href="#I:V">V</a>&nbsp;<a href="#I:W">W</a>&nbsp;</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/docs/javadoc/index.html b/docs/javadoc/index.html
index 781ab81a..2ecbb1fd 100644
--- a/docs/javadoc/index.html
+++ b/docs/javadoc/index.html
@@ -2,8 +2,8 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>dslink-core 0.11.0 API</title>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>dslink-core 0.19.0 API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")
diff --git a/docs/javadoc/org/iot/dsa/DSRuntime.Timer.html b/docs/javadoc/org/iot/dsa/DSRuntime.Timer.html
index 82d6bff7..93d47d93 100644
--- a/docs/javadoc/org/iot/dsa/DSRuntime.Timer.html
+++ b/docs/javadoc/org/iot/dsa/DSRuntime.Timer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSRuntime.Timer (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSRuntime.Timer (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSRuntime.Timer (dslink-core 0.11.0 API)";
+            parent.document.title="DSRuntime.Timer (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -107,13 +107,18 @@ <h2 title="Class DSRuntime.Timer" class="title">Class DSRuntime.Timer</h2>
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Runnable</dd>
+</dl>
+<dl>
 <dt>Enclosing class:</dt>
 <dd><a href="../../../org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa">DSRuntime</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public static class <span class="typeNameLabel">DSRuntime.Timer</span>
-extends java.lang.Object</pre>
+extends java.lang.Object
+implements java.lang.Runnable</pre>
 <div class="block">Can be used to inspect and cancel tasks passed to the run methods in DSRuntime.</div>
 </li>
 </ul>
@@ -165,7 +170,7 @@ <h3>Method Summary</h3>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/iot/dsa/DSRuntime.Timer.html#isRunning--">isRunning</a></span>()</code>
-<div class="block">Trun only when the runnable is actually being run.</div>
+<div class="block">True when the runnable is being actually being executed.</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
@@ -181,18 +186,35 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/iot/dsa/DSRuntime.Timer.html#run--">run</a></span>()</code>
+<div class="block">Do not call.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../org/iot/dsa/DSRuntime.Timer.html#runCount--">runCount</a></span>()</code>
 <div class="block">The number of completed runs.</div>
 </td>
 </tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../../../org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/iot/dsa/DSRuntime.Timer.html#setSkipMissedIntervals-boolean-">setSkipMissedIntervals</a></span>(boolean&nbsp;skipMissed)</code>
+<div class="block">The default is true, set this to false if all intervals should be run, even if they run
+ later than scheduled.</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/iot/dsa/DSRuntime.Timer.html#toString--">toString</a></span>()</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -265,7 +287,7 @@ <h4>isFinished</h4>
 <li class="blockList">
 <h4>isRunning</h4>
 <pre>public&nbsp;boolean&nbsp;isRunning()</pre>
-<div class="block">Trun only when the runnable is actually being run.</div>
+<div class="block">True when the runnable is being actually being executed.</div>
 </li>
 </ul>
 <a name="lastRun--">
@@ -292,16 +314,60 @@ <h4>nextRun</h4>
 </dl>
 </li>
 </ul>
+<a name="run--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>run</h4>
+<pre>public&nbsp;void&nbsp;run()</pre>
+<div class="block">Do not call.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>run</code>&nbsp;in interface&nbsp;<code>java.lang.Runnable</code></dd>
+</dl>
+</li>
+</ul>
 <a name="runCount--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>runCount</h4>
 <pre>public&nbsp;long&nbsp;runCount()</pre>
 <div class="block">The number of completed runs.</div>
 </li>
 </ul>
+<a name="setSkipMissedIntervals-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setSkipMissedIntervals</h4>
+<pre>public&nbsp;<a href="../../../org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa">DSRuntime.Timer</a>&nbsp;setSkipMissedIntervals(boolean&nbsp;skipMissed)</pre>
+<div class="block">The default is true, set this to false if all intervals should be run, even if they run
+ later than scheduled.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>skipMissed</code> - False if intervals should be run after they were scheduled to.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>this</dd>
+</dl>
+</li>
+</ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;java.lang.String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/docs/javadoc/org/iot/dsa/DSRuntime.html b/docs/javadoc/org/iot/dsa/DSRuntime.html
index a5f75f24..3fc75c73 100644
--- a/docs/javadoc/org/iot/dsa/DSRuntime.html
+++ b/docs/javadoc/org/iot/dsa/DSRuntime.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSRuntime (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSRuntime (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSRuntime (dslink-core 0.11.0 API)";
+            parent.document.title="DSRuntime (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -242,7 +242,7 @@ <h4>runAt</h4>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>arg</code> - What to runAt.</dd>
-<dd><code>at</code> - Execution time.  If the time is past, it'll runAt right away.</dd>
+<dd><code>at</code> - Execution time.  If the time is past, it'll run right away.</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>For inspecting and cancel execution.</dd>
 </dl>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSIRequester.html b/docs/javadoc/org/iot/dsa/dslink/DSIRequester.html
index 14719a63..8345d502 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSIRequester.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSIRequester.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSIRequester (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSIRequester (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIRequester (dslink-core 0.11.0 API)";
+            parent.document.title="DSIRequester (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSIResponder.html b/docs/javadoc/org/iot/dsa/dslink/DSIResponder.html
index b8340d29..1ed971af 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSIResponder.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSIResponder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSIResponder (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSIResponder (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIResponder (dslink-core 0.11.0 API)";
+            parent.document.title="DSIResponder (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -98,10 +98,6 @@ <h2 title="Interface DSIResponder" class="title">Interface DSIResponder</h2>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
-<dl>
-<dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></dd>
-</dl>
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">DSIResponder</span></pre>
diff --git a/docs/javadoc/org/iot/dsa/io/DSIoException.html b/docs/javadoc/org/iot/dsa/dslink/DSInternalErrorException.html
similarity index 74%
rename from docs/javadoc/org/iot/dsa/io/DSIoException.html
rename to docs/javadoc/org/iot/dsa/dslink/DSInternalErrorException.html
index aeebdb87..a3c8219a 100644
--- a/docs/javadoc/org/iot/dsa/io/DSIoException.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSInternalErrorException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSIoException (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSInternalErrorException (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIoException (dslink-core 0.11.0 API)";
+            parent.document.title="DSInternalErrorException (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,12 +42,12 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/io/DSIoException.html" target="_top">Frames</a></li>
-<li><a href="DSIoException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSInternalErrorException.html" target="_top">Frames</a></li>
+<li><a href="DSInternalErrorException.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -85,8 +85,8 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.iot.dsa.io</div>
-<h2 title="Class DSIoException" class="title">Class DSIoException</h2>
+<div class="subTitle">org.iot.dsa.dslink</div>
+<h2 title="Class DSInternalErrorException" class="title">Class DSInternalErrorException</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -102,7 +102,7 @@ <h2 title="Class DSIoException" class="title">Class DSIoException</h2>
 <li>java.lang.RuntimeException</li>
 <li>
 <ul class="inheritance">
-<li>org.iot.dsa.io.DSIoException</li>
+<li>org.iot.dsa.dslink.DSInternalErrorException</li>
 </ul>
 </li>
 </ul>
@@ -121,12 +121,12 @@ <h2 title="Class DSIoException" class="title">Class DSIoException</h2>
 </dl>
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">DSIoException</span>
+<pre>public class <span class="typeNameLabel">DSInternalErrorException</span>
 extends java.lang.RuntimeException</pre>
-<div class="block">Unchecked IOException.</div>
+<div class="block">Indicates an unsupported method.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../serialized-form.html#org.iot.dsa.io.DSIoException">Serialized Form</a></dd>
+<dd><a href="../../../../serialized-form.html#org.iot.dsa.dslink.DSInternalErrorException">Serialized Form</a></dd>
 </dl>
 </li>
 </ul>
@@ -146,7 +146,10 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIoException.html#DSIoException-java.lang.String-">DSIoException</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSInternalErrorException.html#DSInternalErrorException--">DSInternalErrorException</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSInternalErrorException.html#DSInternalErrorException-java.lang.String-">DSInternalErrorException</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -185,13 +188,22 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DSIoException-java.lang.String-">
+<a name="DSInternalErrorException--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DSInternalErrorException</h4>
+<pre>public&nbsp;DSInternalErrorException()</pre>
+</li>
+</ul>
+<a name="DSInternalErrorException-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>DSIoException</h4>
-<pre>public&nbsp;DSIoException(java.lang.String&nbsp;message)</pre>
+<h4>DSInternalErrorException</h4>
+<pre>public&nbsp;DSInternalErrorException(java.lang.String&nbsp;message)</pre>
 </li>
 </ul>
 </li>
@@ -221,12 +233,12 @@ <h4>DSIoException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/io/DSIoException.html" target="_top">Frames</a></li>
-<li><a href="DSIoException.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSInternalErrorException.html" target="_top">Frames</a></li>
+<li><a href="DSInternalErrorException.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSInvalidPathException.html b/docs/javadoc/org/iot/dsa/dslink/DSInvalidPathException.html
index 40211624..c0fff610 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSInvalidPathException.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSInvalidPathException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSInvalidPathException (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSInvalidPathException (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSInvalidPathException (dslink-core 0.11.0 API)";
+            parent.document.title="DSInvalidPathException (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -233,7 +233,7 @@ <h4>DSInvalidPathException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li>Prev&nbsp;Class</li>
+<li><a href="../../../../org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSLink.html b/docs/javadoc/org/iot/dsa/dslink/DSLink.html
index 6b721c71..9dce3f90 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSLink.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSLink.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSLink (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLink (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLink (dslink-core 0.11.0 API)";
+            parent.document.title="DSLink (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":9,"i10":9,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":9,"i11":9,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -74,7 +74,7 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -118,24 +118,24 @@ <h2 title="Class DSLink" class="title">Class DSLink</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, java.lang.Runnable, <a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, java.lang.Runnable, <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSLink</span>
 extends <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>
-implements <a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a>, java.lang.Runnable</pre>
+implements java.lang.Runnable</pre>
 <div class="block">Represents an upstream connection, a node tree, and manages the lifecycle of both.
-
  <p>
-
+ <p>
+ <p>
  Links are created with DSLinkConfig object. The main method of the process is responsible for
  creating the config.  After instantiation, the link should call DSLink.run()
-
  <p>
-
+ <p>
+ <p>
  Lifecycle:
-
+ <p>
  TODO</div>
 </li>
 </ul>
@@ -143,6 +143,28 @@ <h2 title="Class DSLink" class="title">Class DSLink</h2>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -207,109 +229,86 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code>java.util.logging.Logger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#getLogger--">getLogger</a></span>()</code>
-<div class="block">The logger as defined in dslink.json.</div>
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#getLogName--">getLogName</a></span>()</code>
+<div class="block">Override point, returns the simple class name by default.</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#getNodes--">getNodes</a></span>()</code>
-<div class="block">Returns the root of the node tree.</div>
-</td>
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#getMain--">getMain</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#getSys--">getSys</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#init-org.iot.dsa.dslink.DSLinkConfig-">init</a></span>(<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;config)</code>
 <div class="block">Configures a link instance including creating the appropriate connection.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#load-org.iot.dsa.dslink.DSLinkConfig-">load</a></span>(<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;config)</code>
 <div class="block">Creates a link by first testing for an existing serialized database.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#main-java.lang.String:A-">main</a></span>(java.lang.String[]&nbsp;args)</code>
 <div class="block">This is a convenience for DSLink.load(new DSLinkConfig(args)).run() and can be used as the
  the main class for any link.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;actionInfo,
-        <a href="../../../../org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a>&nbsp;invocation)</code>
-<div class="block">Handles the save action.</div>
-</td>
-</tr>
 <tr id="i12" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#onInvoke-org.iot.dsa.dslink.responder.InboundInvokeRequest-">onInvoke</a></span>(<a href="../../../../org/iot/dsa/dslink/responder/InboundInvokeRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundInvokeRequest</a>&nbsp;request)</code>
-<div class="block">Responder implementation.</div>
-</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/responder/OutboundListResponse.html" title="interface in org.iot.dsa.dslink.responder">OutboundListResponse</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#onList-org.iot.dsa.dslink.responder.InboundListRequest-">onList</a></span>(<a href="../../../../org/iot/dsa/dslink/responder/InboundListRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundListRequest</a>&nbsp;request)</code>
-<div class="block">Responder implementation.</div>
-</td>
-</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-">onSet</a></span>(<a href="../../../../org/iot/dsa/dslink/responder/InboundSetRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundSetRequest</a>&nbsp;request)</code>
-<div class="block">Responder implementation.</div>
-</td>
-</tr>
-<tr id="i15" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#onStopped--">onStopped</a></span>()</code>
 <div class="block">Called once this node and its entire subtree is stopped.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html" title="interface in org.iot.dsa.dslink.responder">SubscriptionCloseHandler</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#onSubscribe-org.iot.dsa.dslink.responder.InboundSubscribeRequest-">onSubscribe</a></span>(<a href="../../../../org/iot/dsa/dslink/responder/InboundSubscribeRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundSubscribeRequest</a>&nbsp;request)</code>
-<div class="block">Responder implementation.</div>
-</td>
-</tr>
-<tr id="i17" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#run--">run</a></span>()</code>
 <div class="block">Calls starts, waits the stableDelay, then calls stable.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#save--">save</a></span>()</code>
 <div class="block">Serializes the configuration database.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#setNodes-org.iot.dsa.dslink.DSRootNode-">setNodes</a></span>(<a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a>&nbsp;root)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#setNodes-org.iot.dsa.dslink.DSMainNode-">setNodes</a></span>(<a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a>&nbsp;node)</code>&nbsp;</td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#setSaveEnabled-boolean-">setSaveEnabled</a></span>(boolean&nbsp;enabled)</code>
 <div class="block">This is a transient option intended for unit tests.</div>
 </td>
 </tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLink.html#shutdown--">shutdown</a></span>()</code>
+<div class="block">Properly shuts down the link when a thread is executing the run method.</div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSNode">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childChanged-org.iot.dsa.node.DSInfo-">childChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#nodeChanged--">nodeChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.logging.DSLogger">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
-<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#config--">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#config-java.lang.Object-">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer--">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-java.lang.Throwable-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest--">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-java.lang.Throwable-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe--">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-java.lang.Throwable-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
+<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -430,28 +429,37 @@ <h4>getLinkName</h4>
 <div class="block">As defined in dslink.json.</div>
 </li>
 </ul>
-<a name="getLogger--">
+<a name="getLogName--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getLogger</h4>
-<pre>public&nbsp;java.util.logging.Logger&nbsp;getLogger()</pre>
-<div class="block">The logger as defined in dslink.json.</div>
+<h4>getLogName</h4>
+<pre>protected&nbsp;java.lang.String&nbsp;getLogName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">DSLogger</a></code></span></div>
+<div class="block">Override point, returns the simple class name by default.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#getLogger--">getLogger</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#getLogName--">getLogName</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="getNodes--">
+<a name="getMain--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getNodes</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a>&nbsp;getNodes()</pre>
-<div class="block">Returns the root of the node tree.</div>
+<h4>getMain</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a>&nbsp;getMain()</pre>
+</li>
+</ul>
+<a name="getSys--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSys</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a>&nbsp;getSys()</pre>
 </li>
 </ul>
 <a name="init-org.iot.dsa.dslink.DSLinkConfig-">
@@ -490,106 +498,7 @@ <h4>load</h4>
 <h4>main</h4>
 <pre>public static&nbsp;void&nbsp;main(java.lang.String[]&nbsp;args)</pre>
 <div class="block">This is a convenience for DSLink.load(new DSLinkConfig(args)).run() and can be used as the
- the main class for any link.</div>
-</li>
-</ul>
-<a name="onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>onInvoke</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a>&nbsp;onInvoke(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;actionInfo,
-                             <a href="../../../../org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a>&nbsp;invocation)</pre>
-<div class="block">Handles the save action.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>actionInfo</code> - Child info for the action, you can declare a field for the action info for
-                   quick instance comparison.</dd>
-<dd><code>invocation</code> - Details about the incoming invoke as well as the mechanism to send updates
-                   over an open stream.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>It is okay to return null if the action result type is void.</dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/iot/dsa/node/action/DSAction.html#invoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-"><code>DSAction.invoke(DSInfo, ActionInvocation)</code></a></dd>
-</dl>
-</li>
-</ul>
-<a name="onInvoke-org.iot.dsa.dslink.responder.InboundInvokeRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>onInvoke</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a>&nbsp;onInvoke(<a href="../../../../org/iot/dsa/dslink/responder/InboundInvokeRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundInvokeRequest</a>&nbsp;request)</pre>
-<div class="block">Responder implementation.  If one of the children in the path implements DSResponder, it will
- be given responsibility for completing the request.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onInvoke-org.iot.dsa.dslink.responder.InboundInvokeRequest-">onInvoke</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>request</code> - The details of the request and the mechanism for providing updates.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The initial response and close notification mechanism, can be null if the if the
- result type is void.</dd>
-</dl>
-</li>
-</ul>
-<a name="onList-org.iot.dsa.dslink.responder.InboundListRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>onList</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/responder/OutboundListResponse.html" title="interface in org.iot.dsa.dslink.responder">OutboundListResponse</a>&nbsp;onList(<a href="../../../../org/iot/dsa/dslink/responder/InboundListRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundListRequest</a>&nbsp;request)</pre>
-<div class="block">Responder implementation.  If one of the children in the path implements DSResponder, it will
- be given responsibility for completing the request.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onList-org.iot.dsa.dslink.responder.InboundListRequest-">onList</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>request</code> - The details of the request and the mechanism for providing updates.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The initial response and close mechanism.</dd>
-</dl>
-</li>
-</ul>
-<a name="onSubscribe-org.iot.dsa.dslink.responder.InboundSubscribeRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>onSubscribe</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html" title="interface in org.iot.dsa.dslink.responder">SubscriptionCloseHandler</a>&nbsp;onSubscribe(<a href="../../../../org/iot/dsa/dslink/responder/InboundSubscribeRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundSubscribeRequest</a>&nbsp;request)</pre>
-<div class="block">Responder implementation.  If one of the children in the path implements DSResponder, it will
- be given responsibility for completing the request.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onSubscribe-org.iot.dsa.dslink.responder.InboundSubscribeRequest-">onSubscribe</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>request</code> - The details of the request and the mechanism for sending updates.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>Who to notify when the subscription is closed.</dd>
-</dl>
-</li>
-</ul>
-<a name="onSet-org.iot.dsa.dslink.responder.InboundSetRequest-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>onSet</h4>
-<pre>public&nbsp;void&nbsp;onSet(<a href="../../../../org/iot/dsa/dslink/responder/InboundSetRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundSetRequest</a>&nbsp;request)</pre>
-<div class="block">Responder implementation.  If one of the children in the path implements DSResponder, it will
- be given responsibility for completing the request.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-">onSet</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>request</code> - The details of the request.</dd>
-</dl>
+ the main class for any link.  Use DSLink.shutdown() to stop running.</div>
 </li>
 </ul>
 <a name="run--">
@@ -632,13 +541,23 @@ <h4>save</h4>
 <div class="block">Serializes the configuration database.</div>
 </li>
 </ul>
-<a name="setNodes-org.iot.dsa.dslink.DSRootNode-">
+<a name="shutdown--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>shutdown</h4>
+<pre>public&nbsp;void&nbsp;shutdown()</pre>
+<div class="block">Properly shuts down the link when a thread is executing the run method.</div>
+</li>
+</ul>
+<a name="setNodes-org.iot.dsa.dslink.DSMainNode-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setNodes</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;setNodes(<a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a>&nbsp;root)</pre>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;setNodes(<a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a>&nbsp;node)</pre>
 </li>
 </ul>
 <a name="setSaveEnabled-boolean-">
@@ -704,7 +623,7 @@ <h4>setSaveEnabled</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSLinkConfig.html b/docs/javadoc/org/iot/dsa/dslink/DSLinkConfig.html
index e4b68ae4..49939fc9 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSLinkConfig.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSLinkConfig.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSLinkConfig (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLinkConfig (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLinkConfig (dslink-core 0.11.0 API)";
+            parent.document.title="DSLinkConfig (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -106,10 +106,15 @@ <h2 title="Class DSLinkConfig" class="title">Class DSLinkConfig</h2>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSLinkConfig</span>
-extends java.lang.Object</pre>
+extends java.lang.Object
+implements <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></pre>
 <div class="block">Configuration options for starting a link.  The base configuration is the file dslink.json.
  Command line options can override the values in that file. More common options have getters and
  setters as a convenience.</div>
@@ -145,35 +150,19 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_IS_REQUESTER">CFG_IS_REQUESTER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_IS_RESPONDER">CFG_IS_RESPONDER</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_KEY_FILE">CFG_KEY_FILE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_LOG_FILE">CFG_LOG_FILE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_LOG_LEVEL">CFG_LOG_LEVEL</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_NODE_FILE">CFG_NODE_FILE</a></span></code>&nbsp;</td>
-</tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_READ_TIMEOUT">CFG_READ_TIMEOUT</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_NODE_FILE">CFG_NODE_FILE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_ROOT_TYPE">CFG_ROOT_TYPE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_READ_TIMEOUT">CFG_READ_TIMEOUT</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
@@ -185,9 +174,16 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_TRANSPORT_FACTORY">CFG_TRANSPORT_FACTORY</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#CFG_WS_TRANSPORT_FACTORY">CFG_WS_TRANSPORT_FACTORY</a></span></code>&nbsp;</td>
 </tr>
 </table>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
 </li>
 </ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -279,32 +275,32 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getDsaVersion--">getDsaVersion</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getDslinkJson--">getDslinkJson</a></span>()</code>
 <div class="block">If not set, this will attempt to open dslink.json in the working the process directory.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getHelpText--">getHelpText</a></span>()</code>
 <div class="block">Help text for command line options.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getKeys--">getKeys</a></span>()</code>
 <div class="block">If not set, will attempt to use the getConfig in dslink.json and fall back to '.key' in the
  process directory if necessary.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getLinkName--">getLinkName</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>java.io.File</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getLogFile--">getLogFile</a></span>()</code>&nbsp;</td>
-</tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>java.util.logging.Level</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getLogLevel--">getLogLevel</a></span>()</code>
@@ -313,16 +309,16 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i12" class="altColor">
-<td class="colFirst"><code>java.io.File</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getNodesFile--">getNodesFile</a></span>()</code>
-<div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.json' in
- the process directory if necessary.</div>
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getMainType--">getMainType</a></span>()</code>
+<div class="block">The type of the root node.</div>
 </td>
 </tr>
 <tr id="i13" class="rowColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getRootType--">getRootType</a></span>()</code>
-<div class="block">The type of the root node.</div>
+<td class="colFirst"><code>java.io.File</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#getNodesFile--">getNodesFile</a></span>()</code>
+<div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.zip' in
+ the process directory if necessary.</div>
 </td>
 </tr>
 <tr id="i14" class="altColor">
@@ -332,142 +328,112 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i15" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#isRequester--">isRequester</a></span>()</code>
-<div class="block">Looks for the isRequester config, false by default.</div>
-</td>
-</tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#isResponder--">isResponder</a></span>()</code>
-<div class="block">Looks for the isResponder config, true by default.</div>
-</td>
-</tr>
-<tr id="i17" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#parse-java.lang.String:A-">parse</a></span>(java.lang.String[]&nbsp;args)</code>
 <div class="block">Parses command line args to set the internal state of this object.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setBrokerUri-java.lang.String-">setBrokerUri</a></span>(java.lang.String&nbsp;arg)</code>&nbsp;</td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setConfig-java.lang.String-boolean-">setConfig</a></span>(java.lang.String&nbsp;name,
          boolean&nbsp;value)</code>
 <div class="block">Modifies the in-memory representation of dslink.json, but it will not be saved back to disk.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setConfig-java.lang.String-double-">setConfig</a></span>(java.lang.String&nbsp;name,
          double&nbsp;value)</code>
 <div class="block">Modifies the in-memory representation of dslink.json, but it will not be saved back to disk.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setConfig-java.lang.String-int-">setConfig</a></span>(java.lang.String&nbsp;name,
          int&nbsp;value)</code>
 <div class="block">Modifies the in-memory representation of dslink.json, but it will not be saved back to disk.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setConfig-java.lang.String-long-">setConfig</a></span>(java.lang.String&nbsp;name,
          long&nbsp;value)</code>
 <div class="block">Modifies the in-memory representation of dslink.json, but it will not be saved back to disk.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setConfig-java.lang.String-java.lang.String-">setConfig</a></span>(java.lang.String&nbsp;name,
          java.lang.String&nbsp;value)</code>
 <div class="block">Modifies the in-memory representation of dslink.json, but it will not be saved back to disk.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setDslinkJson-org.iot.dsa.node.DSMap-">setDslinkJson</a></span>(<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;map)</code>
 <div class="block">Directly set the map without using file io.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setDslinkJson-java.io.File-">setDslinkJson</a></span>(java.io.File&nbsp;file)</code>
 <div class="block">Sets the link map by file path.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setKeys-org.iot.dsa.security.DSKeys-">setKeys</a></span>(<a href="../../../../org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security">DSKeys</a>&nbsp;keys)</code>
 <div class="block">Directly set the keys without using file io.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setKeys-java.io.File-">setKeys</a></span>(java.io.File&nbsp;file)</code>
 <div class="block">Sets the link keys by file path.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setLinkName-java.lang.String-">setLinkName</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Overrides dslink.json.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setLogFile-java.io.File-">setLogFile</a></span>(java.io.File&nbsp;arg)</code>
-<div class="block">Overrides dslink.json.</div>
-</td>
-</tr>
-<tr id="i30" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setLogLevel-java.util.logging.Level-">setLogLevel</a></span>(java.util.logging.Level&nbsp;level)</code>
 <div class="block">Overrides dslink.json.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setLogLevel-java.lang.String-">setLogLevel</a></span>(java.lang.String&nbsp;level)</code>
 <div class="block">Should be one of the following (case insensitive): all, finest, finer, fine, config, info,
  warning, severe, off.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setNodesFile-java.io.File-">setNodesFile</a></span>(java.io.File&nbsp;file)</code>
-<div class="block">Overrides dslink.json.</div>
-</td>
-</tr>
-<tr id="i33" class="rowColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setRequester-boolean-">setRequester</a></span>(boolean&nbsp;isRequester)</code>
-<div class="block">Overrides dslink.json.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setMainType-java.lang.Class-">setMainType</a></span>(java.lang.Class&nbsp;clazz)</code>
+<div class="block">The type of the root node.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setResponder-boolean-">setResponder</a></span>(boolean&nbsp;isResponder)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setNodesFile-java.io.File-">setNodesFile</a></span>(java.io.File&nbsp;file)</code>
 <div class="block">Overrides dslink.json.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setRootType-java.lang.Class-">setRootType</a></span>(java.lang.Class&nbsp;clazz)</code>
-<div class="block">The type of the root node.</div>
-</td>
-</tr>
-<tr id="i36" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#setToken-java.lang.String-">setToken</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Overrides dslink.json.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html#wasHelpRequested--">wasHelpRequested</a></span>()</code>
 <div class="block">Whether or not -h or --help was provided.</div>
@@ -521,45 +487,6 @@ <h4>CFG_BROKER_URL</h4>
 </dl>
 </li>
 </ul>
-<a name="CFG_CONNECTION_TYPE">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CFG_CONNECTION_TYPE</h4>
-<pre>public static final&nbsp;java.lang.String CFG_CONNECTION_TYPE</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_CONNECTION_TYPE">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="CFG_IS_REQUESTER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CFG_IS_REQUESTER</h4>
-<pre>public static final&nbsp;java.lang.String CFG_IS_REQUESTER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_IS_REQUESTER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="CFG_IS_RESPONDER">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CFG_IS_RESPONDER</h4>
-<pre>public static final&nbsp;java.lang.String CFG_IS_RESPONDER</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_IS_RESPONDER">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
 <a name="CFG_KEY_FILE">
 <!--   -->
 </a>
@@ -573,19 +500,6 @@ <h4>CFG_KEY_FILE</h4>
 </dl>
 </li>
 </ul>
-<a name="CFG_LOG_FILE">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CFG_LOG_FILE</h4>
-<pre>public static final&nbsp;java.lang.String CFG_LOG_FILE</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_LOG_FILE">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
 <a name="CFG_LOG_LEVEL">
 <!--   -->
 </a>
@@ -612,29 +526,29 @@ <h4>CFG_NODE_FILE</h4>
 </dl>
 </li>
 </ul>
-<a name="CFG_READ_TIMEOUT">
+<a name="CFG_CONNECTION_TYPE">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>CFG_READ_TIMEOUT</h4>
-<pre>public static final&nbsp;java.lang.String CFG_READ_TIMEOUT</pre>
+<h4>CFG_CONNECTION_TYPE</h4>
+<pre>public static final&nbsp;java.lang.String CFG_CONNECTION_TYPE</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_READ_TIMEOUT">Constant Field Values</a></dd>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_CONNECTION_TYPE">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
-<a name="CFG_ROOT_TYPE">
+<a name="CFG_READ_TIMEOUT">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>CFG_ROOT_TYPE</h4>
-<pre>public static final&nbsp;java.lang.String CFG_ROOT_TYPE</pre>
+<h4>CFG_READ_TIMEOUT</h4>
+<pre>public static final&nbsp;java.lang.String CFG_READ_TIMEOUT</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_ROOT_TYPE">Constant Field Values</a></dd>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_READ_TIMEOUT">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -664,16 +578,16 @@ <h4>CFG_STABLE_DELAY</h4>
 </dl>
 </li>
 </ul>
-<a name="CFG_TRANSPORT_FACTORY">
+<a name="CFG_WS_TRANSPORT_FACTORY">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>CFG_TRANSPORT_FACTORY</h4>
-<pre>public static final&nbsp;java.lang.String CFG_TRANSPORT_FACTORY</pre>
+<h4>CFG_WS_TRANSPORT_FACTORY</h4>
+<pre>public static final&nbsp;java.lang.String CFG_WS_TRANSPORT_FACTORY</pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_TRANSPORT_FACTORY">Constant Field Values</a></dd>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.dslink.DSLinkConfig.CFG_WS_TRANSPORT_FACTORY">Constant Field Values</a></dd>
 </dl>
 </li>
 </ul>
@@ -805,6 +719,15 @@ <h4>getConfig</h4>
 <div class="block">Looks for the value in dslink.json and if not found, returns the fallback.</div>
 </li>
 </ul>
+<a name="getDsaVersion--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDsaVersion</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getDsaVersion()</pre>
+</li>
+</ul>
 <a name="getDslinkJson--">
 <!--   -->
 </a>
@@ -845,15 +768,6 @@ <h4>getLinkName</h4>
 <pre>public&nbsp;java.lang.String&nbsp;getLinkName()</pre>
 </li>
 </ul>
-<a name="getLogFile--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLogFile</h4>
-<pre>public&nbsp;java.io.File&nbsp;getLogFile()</pre>
-</li>
-</ul>
 <a name="getLogLevel--">
 <!--   -->
 </a>
@@ -872,17 +786,17 @@ <h4>getLogLevel</h4>
 <li class="blockList">
 <h4>getNodesFile</h4>
 <pre>public&nbsp;java.io.File&nbsp;getNodesFile()</pre>
-<div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.json' in
+<div class="block">If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.zip' in
  the process directory if necessary.</div>
 </li>
 </ul>
-<a name="getRootType--">
+<a name="getMainType--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getRootType</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getRootType()</pre>
+<h4>getMainType</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getMainType()</pre>
 <div class="block">The type of the root node.</div>
 </li>
 </ul>
@@ -896,26 +810,6 @@ <h4>getToken</h4>
 <div class="block">Authentication token for the broker, this can return null.</div>
 </li>
 </ul>
-<a name="isRequester--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isRequester</h4>
-<pre>public&nbsp;boolean&nbsp;isRequester()</pre>
-<div class="block">Looks for the isRequester config, false by default.</div>
-</li>
-</ul>
-<a name="isResponder--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isResponder</h4>
-<pre>public&nbsp;boolean&nbsp;isResponder()</pre>
-<div class="block">Looks for the isResponder config, true by default.</div>
-</li>
-</ul>
 <a name="parse-java.lang.String:A-">
 <!--   -->
 </a>
@@ -1046,16 +940,6 @@ <h4>setLinkName</h4>
 <div class="block">Overrides dslink.json.</div>
 </li>
 </ul>
-<a name="setLogFile-java.io.File-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setLogFile</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;setLogFile(java.io.File&nbsp;arg)</pre>
-<div class="block">Overrides dslink.json.</div>
-</li>
-</ul>
 <a name="setLogLevel-java.lang.String-">
 <!--   -->
 </a>
@@ -1087,33 +971,13 @@ <h4>setNodesFile</h4>
 <div class="block">Overrides dslink.json.</div>
 </li>
 </ul>
-<a name="setRequester-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setRequester</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;setRequester(boolean&nbsp;isRequester)</pre>
-<div class="block">Overrides dslink.json.</div>
-</li>
-</ul>
-<a name="setResponder-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setResponder</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;setResponder(boolean&nbsp;isResponder)</pre>
-<div class="block">Overrides dslink.json.</div>
-</li>
-</ul>
-<a name="setRootType-java.lang.Class-">
+<a name="setMainType-java.lang.Class-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setRootType</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;setRootType(java.lang.Class&nbsp;clazz)</pre>
+<h4>setMainType</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>&nbsp;setMainType(java.lang.Class&nbsp;clazz)</pre>
 <div class="block">The type of the root node.</div>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.Listener.html b/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.Listener.html
index c43d9f9d..6e21670d 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.Listener.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.Listener.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSLinkConnection.Listener (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLinkConnection.Listener (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLinkConnection.Listener (dslink-core 0.11.0 API)";
+            parent.document.title="DSLinkConnection.Listener (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/dslink/DSLinkConnection.Listener.html" target="_top">Frames</a></li>
@@ -105,6 +105,8 @@ <h2 title="Interface DSLinkConnection.Listener" class="title">Interface DSLinkCo
 <hr>
 <br>
 <pre>public static interface <span class="typeNameLabel">DSLinkConnection.Listener</span></pre>
+<div class="block">Intended for requester functionality so that requesters can know when to
+ start and stop making requests.</div>
 </li>
 </ul>
 </div>
@@ -126,13 +128,13 @@ <h3>Method Summary</h3>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html#onConnect-org.iot.dsa.dslink.DSLinkConnection-">onConnect</a></span>(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>&nbsp;connection)</code>
-<div class="block">Called when the connection with the endpoint is closed.</div>
+<div class="block">Called asynchronously after the connection with the endpoint is opened.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html#onDisconnect-org.iot.dsa.dslink.DSLinkConnection-">onDisconnect</a></span>(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>&nbsp;connection)</code>
-<div class="block">Called when the connection with the endpoint is established.</div>
+<div class="block">Called synchronously after the connection with the endpoint is closed.</div>
 </td>
 </tr>
 </table>
@@ -157,7 +159,7 @@ <h3>Method Detail</h3>
 <li class="blockList">
 <h4>onConnect</h4>
 <pre>void&nbsp;onConnect(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>&nbsp;connection)</pre>
-<div class="block">Called when the connection with the endpoint is closed.</div>
+<div class="block">Called asynchronously after the connection with the endpoint is opened.</div>
 </li>
 </ul>
 <a name="onDisconnect-org.iot.dsa.dslink.DSLinkConnection-">
@@ -167,7 +169,7 @@ <h4>onConnect</h4>
 <li class="blockList">
 <h4>onDisconnect</h4>
 <pre>void&nbsp;onDisconnect(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>&nbsp;connection)</pre>
-<div class="block">Called when the connection with the endpoint is established.</div>
+<div class="block">Called synchronously after the connection with the endpoint is closed.</div>
 </li>
 </ul>
 </li>
@@ -198,7 +200,7 @@ <h4>onDisconnect</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/dslink/DSLinkConnection.Listener.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.html b/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.html
index f9e6341f..e13b3372 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSLinkConnection.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSLinkConnection (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLinkConnection (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLinkConnection (dslink-core 0.11.0 API)";
+            parent.document.title="DSLinkConnection (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var methods = {"i0":10,"i1":6,"i2":10,"i3":10,"i4":10,"i5":6,"i6":6,"i7":10,"i8":6,"i9":10,"i10":6,"i11":6,"i12":6,"i13":6,"i14":10,"i15":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -74,7 +74,7 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
@@ -118,19 +118,16 @@ <h2 title="Class DSLinkConnection" class="title">Class DSLinkConnection</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public abstract class <span class="typeNameLabel">DSLinkConnection</span>
 extends <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></pre>
 <div class="block">Represents an upstream connection with a broker.
-
- Implementations must have a no-arg public constructor.  It will be dynamically added as a child
- of the DSLink.
-
- The default connection type can be overridden by specifying the config connectionType as a Java
- class name dslink.json.</div>
+ <p>
+ Implementations must have a no-arg public constructor.  It will be dynamically added as
+ a child of the DSLink.</div>
 </li>
 </ul>
 </div>
@@ -151,11 +148,36 @@ <h3>Nested Class Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static interface&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a></span></code>
+<div class="block">Intended for requester functionality so that requesters can know when to
+ start and stop making requests.</div>
+</td>
 </tr>
 </table>
 </li>
 </ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -180,47 +202,95 @@ <h3>Constructor Summary</h3>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>abstract void</code></td>
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#addListener-org.iot.dsa.dslink.DSLinkConnection.Listener-">addListener</a></span>(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a>&nbsp;listener)</code>
 <div class="block">Adds a listener for connection events.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>abstract java.lang.String</code></td>
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#disconnect--">disconnect</a></span>()</code>
+<div class="block">Forcefully closes an open connection.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getConnectionId--">getConnectionId</a></span>()</code>
 <div class="block">A unique descriptive tag such as a combination of the link name and the broker host.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>abstract <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getLink--">getLink</a></span>()</code>
 <div class="block">The link using this connection.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getLogName--">getLogName</a></span>()</code>
+<div class="block">Override point, returns the simple class name by default.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>abstract <a href="../../../../org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink">DSIRequester</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getRequester--">getRequester</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>abstract boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#isOpen--">isOpen</a></span>()</code>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>abstract com.acuity.iot.dsa.dslink.protocol.DSSession</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getSession--">getSession</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getSys--">getSys</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>abstract com.acuity.iot.dsa.dslink.transport.DSTransport</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#getTransport--">getTransport</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#isConnected--">isConnected</a></span>()</code>
 <div class="block">True when a connection is established with the remote endpoint.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#onClose--">onClose</a></span>()</code>
-<div class="block">Called the when network connection has been closed.</div>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#onConnect--">onConnect</a></span>()</code>
+<div class="block">Called after onInitialize and before onRun.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>abstract void</code></td>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#onDisconnect--">onDisconnect</a></span>()</code>
+<div class="block">Called when this network connection has been closed.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#onInitialize--">onInitialize</a></span>()</code>
+<div class="block">Always called before onConnect.</div>
+</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>protected abstract void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#onRun--">onRun</a></span>()</code>
+<div class="block">The long term management of the connection (reading and writing).</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#onStable--">onStable</a></span>()</code>
+<div class="block">Starts the connection.</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html#removeListener-org.iot.dsa.dslink.DSLinkConnection.Listener-">removeListener</a></span>(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a>&nbsp;listener)</code>
 <div class="block">Removes a listener for connection events.</div>
 </td>
@@ -231,14 +301,14 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childChanged-org.iot.dsa.node.DSInfo-">childChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLogger--">getLogger</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#nodeChanged--">nodeChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.logging.DSLogger">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
-<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#config--">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#config-java.lang.Object-">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer--">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-java.lang.Throwable-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest--">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-java.lang.Throwable-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe--">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-java.lang.Throwable-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
+<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -291,8 +361,20 @@ <h3>Method Detail</h3>
 <ul class="blockList">
 <li class="blockList">
 <h4>addListener</h4>
-<pre>public abstract&nbsp;void&nbsp;addListener(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a>&nbsp;listener)</pre>
-<div class="block">Adds a listener for connection events.</div>
+<pre>public&nbsp;void&nbsp;addListener(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a>&nbsp;listener)</pre>
+<div class="block">Adds a listener for connection events.  If already connected, onConnect
+ will be called on the listener.</div>
+</li>
+</ul>
+<a name="disconnect--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>disconnect</h4>
+<pre>public abstract&nbsp;void&nbsp;disconnect()</pre>
+<div class="block">Forcefully closes an open connection.  Does not prevent reconnection, intended for
+ dealing with problems.</div>
 </li>
 </ul>
 <a name="getConnectionId--">
@@ -301,7 +383,7 @@ <h4>addListener</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getConnectionId</h4>
-<pre>public abstract&nbsp;java.lang.String&nbsp;getConnectionId()</pre>
+<pre>public&nbsp;java.lang.String&nbsp;getConnectionId()</pre>
 <div class="block">A unique descriptive tag such as a combination of the link name and the broker host.</div>
 </li>
 </ul>
@@ -311,10 +393,34 @@ <h4>getConnectionId</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLink</h4>
-<pre>public abstract&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;getLink()</pre>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;getLink()</pre>
 <div class="block">The link using this connection.</div>
 </li>
 </ul>
+<a name="getLogName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLogName</h4>
+<pre>protected&nbsp;java.lang.String&nbsp;getLogName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">DSLogger</a></code></span></div>
+<div class="block">Override point, returns the simple class name by default.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#getLogName--">getLogName</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getSys--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSys</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a>&nbsp;getSys()</pre>
+</li>
+</ul>
 <a name="getRequester--">
 <!--   -->
 </a>
@@ -324,24 +430,91 @@ <h4>getRequester</h4>
 <pre>public abstract&nbsp;<a href="../../../../org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink">DSIRequester</a>&nbsp;getRequester()</pre>
 </li>
 </ul>
-<a name="isOpen--">
+<a name="getSession--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>isOpen</h4>
-<pre>public abstract&nbsp;boolean&nbsp;isOpen()</pre>
+<h4>getSession</h4>
+<pre>public abstract&nbsp;com.acuity.iot.dsa.dslink.protocol.DSSession&nbsp;getSession()</pre>
+</li>
+</ul>
+<a name="getTransport--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTransport</h4>
+<pre>public abstract&nbsp;com.acuity.iot.dsa.dslink.transport.DSTransport&nbsp;getTransport()</pre>
+</li>
+</ul>
+<a name="isConnected--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isConnected</h4>
+<pre>public&nbsp;boolean&nbsp;isConnected()</pre>
 <div class="block">True when a connection is established with the remote endpoint.</div>
 </li>
 </ul>
-<a name="onClose--">
+<a name="onConnect--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onConnect</h4>
+<pre>protected abstract&nbsp;void&nbsp;onConnect()</pre>
+<div class="block">Called after onInitialize and before onRun.  This should open the connection,
+ maybe do some preamble messaging, but should return relatively quickly.  Use
+ onRun for the long running of the connection.</div>
+</li>
+</ul>
+<a name="onDisconnect--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onDisconnect</h4>
+<pre>protected abstract&nbsp;void&nbsp;onDisconnect()</pre>
+<div class="block">Called when this network connection has been closed.  This will only be called
+ if the connection is has been established and onRun was called.</div>
+</li>
+</ul>
+<a name="onInitialize--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onInitialize</h4>
+<pre>protected abstract&nbsp;void&nbsp;onInitialize()</pre>
+<div class="block">Always called before onConnect.  If an exception is thrown onConnect and onDisconnect
+ will not be called.</div>
+</li>
+</ul>
+<a name="onRun--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>onClose</h4>
-<pre>public abstract&nbsp;void&nbsp;onClose()</pre>
-<div class="block">Called the when network connection has been closed.</div>
+<h4>onRun</h4>
+<pre>protected abstract&nbsp;void&nbsp;onRun()</pre>
+<div class="block">The long term management of the connection (reading and writing).  When this
+ returns, onDisconnect will be called.</div>
+</li>
+</ul>
+<a name="onStable--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onStable</h4>
+<pre>protected&nbsp;void&nbsp;onStable()</pre>
+<div class="block">Starts the connection.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
 </li>
 </ul>
 <a name="removeListener-org.iot.dsa.dslink.DSLinkConnection.Listener-">
@@ -350,7 +523,7 @@ <h4>onClose</h4>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>removeListener</h4>
-<pre>public abstract&nbsp;void&nbsp;removeListener(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a>&nbsp;listener)</pre>
+<pre>public&nbsp;void&nbsp;removeListener(<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a>&nbsp;listener)</pre>
 <div class="block">Removes a listener for connection events.</div>
 </li>
 </ul>
@@ -407,7 +580,7 @@ <h4>removeListener</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSLinkSession.html b/docs/javadoc/org/iot/dsa/dslink/DSLinkSession.html
deleted file mode 100644
index 03d85718..00000000
--- a/docs/javadoc/org/iot/dsa/dslink/DSLinkSession.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSLinkSession (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLinkSession (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/dslink/DSLinkSession.html" target="_top">Frames</a></li>
-<li><a href="DSLinkSession.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.dslink</div>
-<h2 title="Interface DSLinkSession" class="title">Interface DSLinkSession</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">DSLinkSession</span></pre>
-<div class="block">Represents a line of communication with a remote entity.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html#getConnection--">getConnection</a></span>()</code>
-<div class="block">The associate connection.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html#shouldEndMessage--">shouldEndMessage</a></span>()</code>
-<div class="block">Large outbound messages that can be broken into smaller ones should check this occasionally
- when writing.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getConnection--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getConnection</h4>
-<pre><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>&nbsp;getConnection()</pre>
-<div class="block">The associate connection.</div>
-</li>
-</ul>
-<a name="shouldEndMessage--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>shouldEndMessage</h4>
-<pre>boolean&nbsp;shouldEndMessage()</pre>
-<div class="block">Large outbound messages that can be broken into smaller ones should check this occasionally
- when writing.  The idea is to prevent buffer overflows as well as not have a single message
- hog communication.</div>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/dslink/DSLinkSession.html" target="_top">Frames</a></li>
-<li><a href="DSLinkSession.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSMainNode.html b/docs/javadoc/org/iot/dsa/dslink/DSMainNode.html
new file mode 100644
index 00000000..a54b2805
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/dslink/DSMainNode.html
@@ -0,0 +1,404 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSMainNode (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSMainNode (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSMainNode.html" target="_top">Frames</a></li>
+<li><a href="DSMainNode.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.dslink</div>
+<h2 title="Class DSMainNode" class="title">Class DSMainNode</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">org.iot.dsa.logging.DSLogger</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">org.iot.dsa.node.DSNode</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.dslink.DSMainNode</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSMainNode</span>
+extends <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></pre>
+<div class="block">The root DSNode that triggers a link's custom functionality .  Most links will subclass this and
+ override declareDefaults() to bind their application logic.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html#DSMainNode--">DSMainNode</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html#getLink--">getLink</a></span>()</code>
+<div class="block">The parent link or null.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html#getLogName--">getLogName</a></span>()</code>
+<div class="block">Override point, returns the simple class name by default.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html#isRequester--">isRequester</a></span>()</code>
+<div class="block">Override point, returns true by default.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html#isResponder--">isResponder</a></span>()</code>
+<div class="block">Override point, returns true by default.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></span>(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</code>
+<div class="block">The parent must be a DSLink instance.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.logging.DSLogger">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="DSMainNode--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DSMainNode</h4>
+<pre>public&nbsp;DSMainNode()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getLink--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLink</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;getLink()</pre>
+<div class="block">The parent link or null.</div>
+</li>
+</ul>
+<a name="getLogName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLogName</h4>
+<pre>protected&nbsp;java.lang.String&nbsp;getLogName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">DSLogger</a></code></span></div>
+<div class="block">Override point, returns the simple class name by default.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#getLogName--">getLogName</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isRequester--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isRequester</h4>
+<pre>public&nbsp;boolean&nbsp;isRequester()</pre>
+<div class="block">Override point, returns true by default.</div>
+</li>
+</ul>
+<a name="isResponder--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isResponder</h4>
+<pre>public&nbsp;boolean&nbsp;isResponder()</pre>
+<div class="block">Override point, returns true by default.</div>
+</li>
+</ul>
+<a name="validateParent-org.iot.dsa.node.DSNode-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>validateParent</h4>
+<pre>public&nbsp;void&nbsp;validateParent(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</pre>
+<div class="block">The parent must be a DSLink instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSMainNode.html" target="_top">Frames</a></li>
+<li><a href="DSMainNode.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSPermissionException.html b/docs/javadoc/org/iot/dsa/dslink/DSPermissionException.html
index 93d5a4b7..84f1ae9f 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSPermissionException.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSPermissionException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSPermissionException (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSPermissionException (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSPermissionException (dslink-core 0.11.0 API)";
+            parent.document.title="DSPermissionException (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -151,6 +151,9 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html#DSPermissionException--">DSPermissionException</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html#DSPermissionException-java.lang.String-">DSPermissionException</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
 </tr>
 </table>
@@ -197,6 +200,15 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
+<a name="DSPermissionException--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DSPermissionException</h4>
+<pre>public&nbsp;DSPermissionException()</pre>
+</li>
+</ul>
 <a name="DSPermissionException-java.lang.String-">
 <!--   -->
 </a>
@@ -233,7 +245,7 @@ <h4>DSPermissionException</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSRequestException.html b/docs/javadoc/org/iot/dsa/dslink/DSRequestException.html
index 375486f4..ccd458aa 100644
--- a/docs/javadoc/org/iot/dsa/dslink/DSRequestException.html
+++ b/docs/javadoc/org/iot/dsa/dslink/DSRequestException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSRequestException (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSRequestException (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSRequestException (dslink-core 0.11.0 API)";
+            parent.document.title="DSRequestException (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/dslink/DSRequestException.html" target="_top">Frames</a></li>
@@ -127,7 +127,7 @@ <h2 title="Class DSRequestException" class="title">Class DSRequestException</h2>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink">DSInvalidPathException</a>, <a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink">DSPermissionException</a></dd>
+<dd><a href="../../../../org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink">DSInvalidPathException</a>, <a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink">DSPermissionException</a>, <a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink">DSUnsupportedException</a></dd>
 </dl>
 <hr>
 <br>
@@ -307,7 +307,7 @@ <h4>setDetail</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/dslink/DSRequestException.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSRootNode.html b/docs/javadoc/org/iot/dsa/dslink/DSRootNode.html
deleted file mode 100644
index 2aaa66dc..00000000
--- a/docs/javadoc/org/iot/dsa/dslink/DSRootNode.html
+++ /dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSRootNode (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSRootNode (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/dslink/DSRootNode.html" target="_top">Frames</a></li>
-<li><a href="DSRootNode.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.dslink</div>
-<h2 title="Class DSRootNode" class="title">Class DSRootNode</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">org.iot.dsa.logging.DSLogger</a></li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">org.iot.dsa.node.DSNode</a></li>
-<li>
-<ul class="inheritance">
-<li>org.iot.dsa.dslink.DSRootNode</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">DSRootNode</span>
-extends <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></pre>
-<div class="block">The root DSNode that triggers a link's custom functionality .  Most links will subclass this and
- override declareDefaults() to bind their application logic.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSRootNode.html#DSRootNode--">DSRootNode</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSRootNode.html#getLink--">getLink</a></span>()</code>
-<div class="block">The parent link or null.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>protected java.util.logging.Logger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSRootNode.html#getLogger-java.lang.String-">getLogger</a></span>(java.lang.String&nbsp;name)</code>
-<div class="block">Creates a child logger of the link.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSRootNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></span>(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</code>
-<div class="block">The parent must be a DSLink instance.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSNode">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childChanged-org.iot.dsa.node.DSInfo-">childChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLogger--">getLogger</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#nodeChanged--">nodeChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.logging.DSLogger">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
-<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#config--">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#config-java.lang.Object-">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer--">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-java.lang.Throwable-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest--">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-java.lang.Throwable-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe--">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-java.lang.Throwable-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
-<code>forEach, spliterator</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="DSRootNode--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DSRootNode</h4>
-<pre>public&nbsp;DSRootNode()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="getLogger-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLogger</h4>
-<pre>protected&nbsp;java.util.logging.Logger&nbsp;getLogger(java.lang.String&nbsp;name)</pre>
-<div class="block">Creates a child logger of the link.</div>
-</li>
-</ul>
-<a name="getLink--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLink</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;getLink()</pre>
-<div class="block">The parent link or null.</div>
-</li>
-</ul>
-<a name="validateParent-org.iot.dsa.node.DSNode-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>validateParent</h4>
-<pre>public&nbsp;void&nbsp;validateParent(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</pre>
-<div class="block">The parent must be a DSLink instance.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/dslink/DSRootNode.html" target="_top">Frames</a></li>
-<li><a href="DSRootNode.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSSysNode.html b/docs/javadoc/org/iot/dsa/dslink/DSSysNode.html
new file mode 100644
index 00000000..ee8a49df
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/dslink/DSSysNode.html
@@ -0,0 +1,441 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSSysNode (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSSysNode (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSSysNode.html" target="_top">Frames</a></li>
+<li><a href="DSSysNode.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.dslink</div>
+<h2 title="Class DSSysNode" class="title">Class DSSysNode</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">org.iot.dsa.logging.DSLogger</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">org.iot.dsa.node.DSNode</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.dslink.DSSysNode</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSSysNode</span>
+extends <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></pre>
+<div class="block">The root of the system nodes.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#DSSysNode--">DSSysNode</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#declareDefaults--">declareDefaults</a></span>()</code>
+<div class="block">The is only called once for each class.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#getConnection--">getConnection</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#getLink--">getLink</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#getLogName--">getLogName</a></span>()</code>
+<div class="block">Override point, returns the simple class name by default.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;action,
+        <a href="../../../../org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a>&nbsp;invocation)</code>
+<div class="block">Override point, called by the default implementation of DSAction.invoke.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></span>(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</code>
+<div class="block">Override point, throw a meaningful IllegalArgumentException if the parent is not allowed</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.logging.DSLogger">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="DSSysNode--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DSSysNode</h4>
+<pre>public&nbsp;DSSysNode()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="declareDefaults--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>declareDefaults</h4>
+<pre>protected&nbsp;void&nbsp;declareDefaults()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">DSNode</a></code></span></div>
+<div class="block">The is only called once for each class.  It's purpose is to define the default children of
+ the node subtype.  Use the declareDefault method to add non-removable children that all
+ runtime instances should have.  Be sure to call super.declareDefaults().</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-"><code>To create non-removable children.</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="getConnection--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getConnection</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>&nbsp;getConnection()</pre>
+</li>
+</ul>
+<a name="getLink--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLink</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>&nbsp;getLink()</pre>
+</li>
+</ul>
+<a name="getLogName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLogName</h4>
+<pre>protected&nbsp;java.lang.String&nbsp;getLogName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">DSLogger</a></code></span></div>
+<div class="block">Override point, returns the simple class name by default.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#getLogName--">getLogName</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onInvoke</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a>&nbsp;onInvoke(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;action,
+                             <a href="../../../../org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a>&nbsp;invocation)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">DSNode</a></code></span></div>
+<div class="block">Override point, called by the default implementation of DSAction.invoke.  You should call
+ super.onInvoke if you do not handle an incoming invocation.  However, do not call super if
+ you do.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>action</code> - Child info for the action, you can declare a field for the action info for
+                   quick instance comparison.</dd>
+<dd><code>invocation</code> - Details about the incoming invoke as well as the mechanism to send updates
+                   over an open stream.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>It is okay to return null if the action result type is void.</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/iot/dsa/node/action/DSAction.html#invoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-"><code>DSAction.invoke(DSInfo, ActionInvocation)</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="validateParent-org.iot.dsa.node.DSNode-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>validateParent</h4>
+<pre>protected&nbsp;void&nbsp;validateParent(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">DSNode</a></code></span></div>
+<div class="block">Override point, throw a meaningful IllegalArgumentException if the parent is not allowed</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSSysNode.html" target="_top">Frames</a></li>
+<li><a href="DSSysNode.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/dslink/DSUnsupportedException.html b/docs/javadoc/org/iot/dsa/dslink/DSUnsupportedException.html
new file mode 100644
index 00000000..fbc6f499
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/dslink/DSUnsupportedException.html
@@ -0,0 +1,290 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSUnsupportedException (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSUnsupportedException (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="DSUnsupportedException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.iot.dsa.dslink.DSRequestException">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.dslink</div>
+<h2 title="Class DSUnsupportedException" class="title">Class DSUnsupportedException</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Throwable</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Exception</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.RuntimeException</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">org.iot.dsa.dslink.DSRequestException</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.dslink.DSUnsupportedException</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable</dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSUnsupportedException</span>
+extends <a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">DSRequestException</a></pre>
+<div class="block">Indicates an unsupported method.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../serialized-form.html#org.iot.dsa.dslink.DSUnsupportedException">Serialized Form</a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html#DSUnsupportedException--">DSUnsupportedException</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html#DSUnsupportedException-java.lang.String-">DSUnsupportedException</a></span>(java.lang.String&nbsp;message)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.dslink.DSRequestException">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">DSRequestException</a></h3>
+<code><a href="../../../../org/iot/dsa/dslink/DSRequestException.html#getDetail--">getDetail</a>, <a href="../../../../org/iot/dsa/dslink/DSRequestException.html#setDetail-java.lang.String-">setDetail</a>, <a href="../../../../org/iot/dsa/dslink/DSRequestException.html#setDetail-java.lang.Throwable-">setDetail</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Throwable">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Throwable</h3>
+<code>addSuppressed, fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, getSuppressed, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="DSUnsupportedException--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DSUnsupportedException</h4>
+<pre>public&nbsp;DSUnsupportedException()</pre>
+</li>
+</ul>
+<a name="DSUnsupportedException-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DSUnsupportedException</h4>
+<pre>public&nbsp;DSUnsupportedException(java.lang.String&nbsp;message)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/dslink/DSUnsupportedException.html" target="_top">Frames</a></li>
+<li><a href="DSUnsupportedException.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.iot.dsa.dslink.DSRequestException">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/dslink/package-frame.html b/docs/javadoc/org/iot/dsa/dslink/package-frame.html
index c3db9d01..70bb8961 100644
--- a/docs/javadoc/org/iot/dsa/dslink/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/dslink/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -16,20 +16,22 @@ <h2 title="Interfaces">Interfaces</h2>
 <li><a href="DSIRequester.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSIRequester</span></a></li>
 <li><a href="DSIResponder.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSIResponder</span></a></li>
 <li><a href="DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSLinkConnection.Listener</span></a></li>
-<li><a href="DSLinkSession.html" title="interface in org.iot.dsa.dslink" target="classFrame"><span class="interfaceName">DSLinkSession</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="DSLink.html" title="class in org.iot.dsa.dslink" target="classFrame">DSLink</a></li>
 <li><a href="DSLinkConfig.html" title="class in org.iot.dsa.dslink" target="classFrame">DSLinkConfig</a></li>
 <li><a href="DSLinkConnection.html" title="class in org.iot.dsa.dslink" target="classFrame">DSLinkConnection</a></li>
-<li><a href="DSRootNode.html" title="class in org.iot.dsa.dslink" target="classFrame">DSRootNode</a></li>
+<li><a href="DSMainNode.html" title="class in org.iot.dsa.dslink" target="classFrame">DSMainNode</a></li>
+<li><a href="DSSysNode.html" title="class in org.iot.dsa.dslink" target="classFrame">DSSysNode</a></li>
 </ul>
 <h2 title="Exceptions">Exceptions</h2>
 <ul title="Exceptions">
+<li><a href="DSInternalErrorException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSInternalErrorException</a></li>
 <li><a href="DSInvalidPathException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSInvalidPathException</a></li>
 <li><a href="DSPermissionException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSPermissionException</a></li>
 <li><a href="DSRequestException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSRequestException</a></li>
+<li><a href="DSUnsupportedException.html" title="class in org.iot.dsa.dslink" target="classFrame">DSUnsupportedException</a></li>
 </ul>
 </div>
 </body>
diff --git a/docs/javadoc/org/iot/dsa/dslink/package-summary.html b/docs/javadoc/org/iot/dsa/dslink/package-summary.html
index 48a6ae1e..d6bf341e 100644
--- a/docs/javadoc/org/iot/dsa/dslink/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/dslink/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.dslink (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.dslink (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -99,12 +99,9 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.dslink</h1>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink">DSLinkConnection.Listener</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink">DSLinkSession</a></td>
 <td class="colLast">
-<div class="block">Represents a line of communication with a remote entity.</div>
+<div class="block">Intended for requester functionality so that requesters can know when to
+ start and stop making requests.</div>
 </td>
 </tr>
 </tbody>
@@ -137,11 +134,17 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.dslink</h1>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></td>
+<td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a></td>
 <td class="colLast">
 <div class="block">The root DSNode that triggers a link's custom functionality .</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a></td>
+<td class="colLast">
+<div class="block">The root of the system nodes.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -154,23 +157,35 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.dslink</h1>
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink">DSInternalErrorException</a></td>
+<td class="colLast">
+<div class="block">Indicates an unsupported method.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink">DSInvalidPathException</a></td>
 <td class="colLast">
 <div class="block">Indicates a request path was invalid.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink">DSPermissionException</a></td>
 <td class="colLast">
 <div class="block">Indicates a request has insufficient permissions.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">DSRequestException</a></td>
 <td class="colLast">
 <div class="block">Indicates something was wrong with a request.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink">DSUnsupportedException</a></td>
+<td class="colLast">
+<div class="block">Indicates an unsupported method.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/package-tree.html b/docs/javadoc/org/iot/dsa/dslink/package-tree.html
index d8917be8..aff1a2da 100644
--- a/docs/javadoc/org/iot/dsa/dslink/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/dslink/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.dslink Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.dslink Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -80,14 +80,15 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConfig</span></a></li>
-<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a>
+<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConfig</span></a> (implements org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)</li>
+<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a> (implements org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)
 <ul>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSNode</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, java.lang.Iterable&lt;T&gt;)
 <ul>
-<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLink</span></a> (implements org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a>, java.lang.Runnable)</li>
+<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLink</span></a> (implements java.lang.Runnable)</li>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConnection</span></a></li>
-<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSRootNode</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSMainNode</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSSysNode</span></a></li>
 </ul>
 </li>
 </ul>
@@ -98,10 +99,12 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.RuntimeException
 <ul>
+<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSInternalErrorException</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSRequestException</span></a>
 <ul>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSInvalidPathException</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSPermissionException</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSUnsupportedException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -118,7 +121,6 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSIRequester</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSIResponder</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConnection.Listener</span></a></li>
-<li type="circle">org.iot.dsa.dslink.<a href="../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkSession</span></a></li>
 </ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/AbstractInvokeHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/AbstractInvokeHandler.html
index 5cf2ea6d..5e454c7a 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/AbstractInvokeHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/AbstractInvokeHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>AbstractInvokeHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>AbstractInvokeHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractInvokeHandler (dslink-core 0.11.0 API)";
+            parent.document.title="AbstractInvokeHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -110,6 +110,10 @@ <h2 title="Class AbstractInvokeHandler" class="title">Class AbstractInvokeHandle
 <dt>All Implemented Interfaces:</dt>
 <dd><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></dd>
 </dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public abstract class <span class="typeNameLabel">AbstractInvokeHandler</span>
@@ -212,7 +216,7 @@ <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/AbstractListHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/AbstractListHandler.html
index 7ebecf92..1097c52e 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/AbstractListHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/AbstractListHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>AbstractListHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>AbstractListHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractListHandler (dslink-core 0.11.0 API)";
+            parent.document.title="AbstractListHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -200,7 +200,7 @@ <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html
index 68fa2b42..2345a5f3 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>AbstractSubscribeHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>AbstractSubscribeHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractSubscribeHandler (dslink-core 0.11.0 API)";
+            parent.document.title="AbstractSubscribeHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" target="_top">Frames</a></li>
@@ -197,7 +197,7 @@ <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code></li>
 </ul>
 </li>
 </ul>
@@ -312,7 +312,7 @@ <h4>onInit</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/DSIPublisher.Event.html b/docs/javadoc/org/iot/dsa/dslink/requester/ErrorType.html
similarity index 57%
rename from docs/javadoc/org/iot/dsa/node/DSIPublisher.Event.html
rename to docs/javadoc/org/iot/dsa/dslink/requester/ErrorType.html
index 573b9df5..10819613 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIPublisher.Event.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/ErrorType.html
@@ -2,23 +2,23 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIPublisher.Event (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>ErrorType (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIPublisher.Event (dslink-core 0.11.0 API)";
+            parent.document.title="ErrorType (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9};
+var methods = {"i0":9,"i1":9,"i2":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -37,26 +37,26 @@
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
 <li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/node/DSIPublisher.Event.html" target="_top">Frames</a></li>
-<li><a href="DSIPublisher.Event.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/ErrorType.html" target="_top">Frames</a></li>
+<li><a href="ErrorType.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
@@ -91,18 +91,18 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">org.iot.dsa.node</div>
-<h2 title="Enum DSIPublisher.Event" class="title">Enum DSIPublisher.Event</h2>
+<div class="subTitle">org.iot.dsa.dslink.requester</div>
+<h2 title="Enum ErrorType" class="title">Enum ErrorType</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>java.lang.Enum&lt;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&gt;</li>
+<li>java.lang.Enum&lt;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>org.iot.dsa.node.DSIPublisher.Event</li>
+<li>org.iot.dsa.dslink.requester.ErrorType</li>
 </ul>
 </li>
 </ul>
@@ -113,17 +113,12 @@ <h2 title="Enum DSIPublisher.Event" class="title">Enum DSIPublisher.Event</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&gt;</dd>
-</dl>
-<dl>
-<dt>Enclosing interface:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node">DSIPublisher</a></dd>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&gt;</dd>
 </dl>
 <hr>
 <br>
-<pre>public static enum <span class="typeNameLabel">DSIPublisher.Event</span>
-extends java.lang.Enum&lt;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&gt;</pre>
-<div class="block">Passed to DSISubscriber onEvent to describe the event.</div>
+<pre>public enum <span class="typeNameLabel">ErrorType</span>
+extends java.lang.Enum&lt;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&gt;</pre>
 </li>
 </ul>
 </div>
@@ -142,29 +137,16 @@ <h3>Enum Constant Summary</h3>
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#CHILD_ADDED">CHILD_ADDED</a></span></code>
-<div class="block">The event will have a source (parent) and an info.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#badRequest">badRequest</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#CHILD_CHANGED">CHILD_CHANGED</a></span></code>
-<div class="block">The event will have a source (parent) and an info.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#internalError">internalError</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#CHILD_REMOVED">CHILD_REMOVED</a></span></code>
-<div class="block">The event will have a source (parent) and an info.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#notSupported">notSupported</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#INFO_CHANGED">INFO_CHANGED</a></span></code>
-<div class="block">The info of a child changed.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#PUBLISHER_CHANGED">PUBLISHER_CHANGED</a></span></code>
-<div class="block">The publisher was mutated in such a way that did not involve a child.</div>
-</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#permissionDenied">permissionDenied</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -182,14 +164,19 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<td class="colFirst"><code>static java.lang.RuntimeException</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#makeException-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">makeException</a></span>(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+             java.lang.String&nbsp;message)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html#values--">values</a></span>()</code>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html#values--">values</a></span>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
@@ -223,54 +210,40 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="CHILD_ADDED">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>CHILD_ADDED</h4>
-<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a> CHILD_ADDED</pre>
-<div class="block">The event will have a source (parent) and an info.</div>
-</li>
-</ul>
-<a name="CHILD_CHANGED">
+<a name="badRequest">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>CHILD_CHANGED</h4>
-<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a> CHILD_CHANGED</pre>
-<div class="block">The event will have a source (parent) and an info.</div>
+<h4>badRequest</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a> badRequest</pre>
 </li>
 </ul>
-<a name="CHILD_REMOVED">
+<a name="internalError">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>CHILD_REMOVED</h4>
-<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a> CHILD_REMOVED</pre>
-<div class="block">The event will have a source (parent) and an info.</div>
+<h4>internalError</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a> internalError</pre>
 </li>
 </ul>
-<a name="INFO_CHANGED">
+<a name="notSupported">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>INFO_CHANGED</h4>
-<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a> INFO_CHANGED</pre>
-<div class="block">The info of a child changed.  The event will have a source (parent) and an info.</div>
+<h4>notSupported</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a> notSupported</pre>
 </li>
 </ul>
-<a name="PUBLISHER_CHANGED">
+<a name="permissionDenied">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>PUBLISHER_CHANGED</h4>
-<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a> PUBLISHER_CHANGED</pre>
-<div class="block">The publisher was mutated in such a way that did not involve a child.</div>
+<h4>permissionDenied</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a> permissionDenied</pre>
 </li>
 </ul>
 </li>
@@ -287,12 +260,12 @@ <h3>Method Detail</h3>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>[]&nbsp;values()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
 <pre>
-for (DSIPublisher.Event c : DSIPublisher.Event.values())
+for (ErrorType c : ErrorType.values())
 &nbsp;   System.out.println(c);
 </pre></div>
 <dl>
@@ -304,10 +277,10 @@ <h4>values</h4>
 <a name="valueOf-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -323,6 +296,16 @@ <h4>valueOf</h4>
 </dl>
 </li>
 </ul>
+<a name="makeException-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>makeException</h4>
+<pre>public static&nbsp;java.lang.RuntimeException&nbsp;makeException(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+                                                       java.lang.String&nbsp;message)</pre>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -339,26 +322,26 @@ <h4>valueOf</h4>
 <!--   -->
 </a>
 <ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
 <li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
 </ul>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/node/DSIPublisher.Event.html" target="_top">Frames</a></li>
-<li><a href="DSIPublisher.Event.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/ErrorType.html" target="_top">Frames</a></li>
+<li><a href="ErrorType.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
 </ul>
 <div>
 <script type="text/javascript"><!--
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html
index f18fb1e6..ff05255c 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>OutboundInvokeHandler.Mode (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundInvokeHandler.Mode (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundInvokeHandler.Mode (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundInvokeHandler.Mode (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.html
index b327bbe8..99ec301c 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundInvokeHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>OutboundInvokeHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundInvokeHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundInvokeHandler (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundInvokeHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -104,7 +104,7 @@ <h2 title="Interface OutboundInvokeHandler" class="title">Interface OutboundInvo
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractInvokeHandler</a></dd>
+<dd><a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractInvokeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></dd>
 </dl>
 <hr>
 <br>
@@ -202,7 +202,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code></li>
 </ul>
 </li>
 </ul>
@@ -343,7 +343,7 @@ <h4>onUpdate</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundListHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundListHandler.html
index 0cceb25e..85330b99 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundListHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundListHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>OutboundListHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundListHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundListHandler (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundListHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -177,7 +177,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundRequestHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundRequestHandler.html
index 723f5fb4..46602f89 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundRequestHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundRequestHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>OutboundRequestHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundRequestHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundRequestHandler (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundRequestHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -104,7 +104,7 @@ <h2 title="Interface OutboundRequestHandler" class="title">Interface OutboundReq
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractInvokeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractListHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractSubscribeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></dd>
+<dd><a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractInvokeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractListHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractSubscribeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></dd>
 </dl>
 <hr>
 <br>
@@ -136,9 +136,8 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></span>(java.lang.String&nbsp;type,
-       java.lang.String&nbsp;msg,
-       java.lang.String&nbsp;detail)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></span>(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+       java.lang.String&nbsp;msg)</code>
 <div class="block">Callback for when an error is received.</div>
 </td>
 </tr>
@@ -168,17 +167,16 @@ <h4>onClose</h4>
  there is an error as well.</div>
 </li>
 </ul>
-<a name="onError-java.lang.String-java.lang.String-java.lang.String-">
+<a name="onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>onError</h4>
-<pre>void&nbsp;onError(java.lang.String&nbsp;type,
-             java.lang.String&nbsp;msg,
-             java.lang.String&nbsp;detail)</pre>
-<div class="block">Callback for when an error is received.  If the stream is also closed, onClose will also be
- closed.  Does nothing by default.</div>
+<pre>void&nbsp;onError(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+             java.lang.String&nbsp;msg)</pre>
+<div class="block">Callback for when an error is received.  onClose will also be called after this.
+ Does nothing by default.</div>
 </li>
 </ul>
 </li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundStream.html b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundStream.html
index 66197d0d..fda97501 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundStream.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundStream.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>OutboundStream (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundStream (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundStream (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundStream (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html
index 633bb881..a473bb62 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>OutboundSubscribeHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundSubscribeHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundSubscribeHandler (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundSubscribeHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundStream.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" target="_top">Frames</a></li>
@@ -151,7 +151,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onClose--">onClose</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code></li>
 </ul>
 </li>
 </ul>
@@ -231,7 +231,7 @@ <h4>onUpdate</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundStream.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/SimpleInvokeHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/SimpleInvokeHandler.html
new file mode 100644
index 00000000..10d88dca
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/SimpleInvokeHandler.html
@@ -0,0 +1,500 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>SimpleInvokeHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="SimpleInvokeHandler (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" target="_top">Frames</a></li>
+<li><a href="SimpleInvokeHandler.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.dslink.requester</div>
+<h2 title="Class SimpleInvokeHandler" class="title">Class SimpleInvokeHandler</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">org.iot.dsa.dslink.requester.AbstractInvokeHandler</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.dslink.requester.SimpleInvokeHandler</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a>, <a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">SimpleInvokeHandler</span>
+extends <a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractInvokeHandler</a></pre>
+<div class="block">Action handler for non-tables/streams.
+ <p>
+ Call getResult(long timeout) to block until the invocation is complete. It will either return
+ the result (possibly null), or throw an exception.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.iot.dsa.dslink.requester.OutboundInvokeHandler">
+<!--   -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a></h3>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester">OutboundInvokeHandler.Mode</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#SimpleInvokeHandler--">SimpleInvokeHandler</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#getResult-long-">getResult</a></span>(long&nbsp;timeout)</code>
+<div class="block">Waits for the stream to close before returning, or the timeout to occur.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#isAutoClose--">isAutoClose</a></span>()</code>
+<div class="block">True by default, whether or not to close the stream upon receiving the first result.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onClose--">onClose</a></span>()</code>
+<div class="block">Causes getResult to return.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onColumns-org.iot.dsa.node.DSList-">onColumns</a></span>(<a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;list)</code>
+<div class="block">Does nothing.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></span>(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+       java.lang.String&nbsp;msg)</code>
+<div class="block">Will create an exception to be thrown by getResult.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onInsert-int-org.iot.dsa.node.DSList-">onInsert</a></span>(int&nbsp;index,
+        <a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;rows)</code>
+<div class="block">Will result in an error since tables and streams are not supported.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onMode-org.iot.dsa.dslink.requester.OutboundInvokeHandler.Mode-">onMode</a></span>(<a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester">OutboundInvokeHandler.Mode</a>&nbsp;mode)</code>
+<div class="block">Does nothing.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onReplace-int-int-org.iot.dsa.node.DSList-">onReplace</a></span>(int&nbsp;start,
+         int&nbsp;end,
+         <a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;rows)</code>
+<div class="block">Will result in an error since tables and streams are not supported.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onTableMeta-org.iot.dsa.node.DSMap-">onTableMeta</a></span>(<a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;map)</code>
+<div class="block">Called whenever metadata for the entire table is received.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#onUpdate-org.iot.dsa.node.DSList-">onUpdate</a></span>(<a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;row)</code>
+<div class="block">Captures the result and if auto-close is true, closes the stream.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html#setAutoClose-boolean-">setAutoClose</a></span>(boolean&nbsp;arg)</code>
+<div class="block">Whether or not to auto close the stream on the first update.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.dslink.requester.AbstractInvokeHandler">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">AbstractInvokeHandler</a></h3>
+<code><a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html#getParams--">getParams</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html#getStream--">getStream</a>, <a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html#onInit-java.lang.String-org.iot.dsa.node.DSMap-org.iot.dsa.dslink.requester.OutboundStream-">onInit</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="SimpleInvokeHandler--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SimpleInvokeHandler</h4>
+<pre>public&nbsp;SimpleInvokeHandler()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getResult-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getResult</h4>
+<pre>public&nbsp;<a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;getResult(long&nbsp;timeout)</pre>
+<div class="block">Waits for the stream to close before returning, or the timeout to occur.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>timeout</code> - Passed to Object.wait</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Null, or the first update.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.RuntimeException</code> - if there is a timeout, or if there are any errors.</dd>
+</dl>
+</li>
+</ul>
+<a name="isAutoClose--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAutoClose</h4>
+<pre>public&nbsp;boolean&nbsp;isAutoClose()</pre>
+<div class="block">True by default, whether or not to close the stream upon receiving the first result.</div>
+</li>
+</ul>
+<a name="onClose--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onClose</h4>
+<pre>public&nbsp;void&nbsp;onClose()</pre>
+<div class="block">Causes getResult to return.</div>
+</li>
+</ul>
+<a name="onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onError</h4>
+<pre>public&nbsp;void&nbsp;onError(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+                    java.lang.String&nbsp;msg)</pre>
+<div class="block">Will create an exception to be thrown by getResult.</div>
+</li>
+</ul>
+<a name="onColumns-org.iot.dsa.node.DSList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onColumns</h4>
+<pre>public&nbsp;void&nbsp;onColumns(<a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;list)</pre>
+<div class="block">Does nothing.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>list</code> - A list of maps.</dd>
+</dl>
+</li>
+</ul>
+<a name="onInsert-int-org.iot.dsa.node.DSList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onInsert</h4>
+<pre>public&nbsp;void&nbsp;onInsert(int&nbsp;index,
+                     <a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;rows)</pre>
+<div class="block">Will result in an error since tables and streams are not supported.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>index</code> - Where to insert the given rows.</dd>
+<dd><code>rows</code> - What to insert at the given index.</dd>
+</dl>
+</li>
+</ul>
+<a name="onMode-org.iot.dsa.dslink.requester.OutboundInvokeHandler.Mode-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onMode</h4>
+<pre>public&nbsp;void&nbsp;onMode(<a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester">OutboundInvokeHandler.Mode</a>&nbsp;mode)</pre>
+<div class="block">Does nothing.</div>
+</li>
+</ul>
+<a name="onReplace-int-int-org.iot.dsa.node.DSList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onReplace</h4>
+<pre>public&nbsp;void&nbsp;onReplace(int&nbsp;start,
+                      int&nbsp;end,
+                      <a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;rows)</pre>
+<div class="block">Will result in an error since tables and streams are not supported.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>start</code> - First inclusive of rows to be replaced.</dd>
+<dd><code>end</code> - Last inclusive index of rows to be replaced.</dd>
+<dd><code>rows</code> - What to insert at the starting index.</dd>
+</dl>
+</li>
+</ul>
+<a name="onTableMeta-org.iot.dsa.node.DSMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onTableMeta</h4>
+<pre>public&nbsp;void&nbsp;onTableMeta(<a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;map)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html#onTableMeta-org.iot.dsa.node.DSMap-">OutboundInvokeHandler</a></code></span></div>
+<div class="block">Called whenever metadata for the entire table is received.</div>
+</li>
+</ul>
+<a name="onUpdate-org.iot.dsa.node.DSList-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onUpdate</h4>
+<pre>public&nbsp;void&nbsp;onUpdate(<a href="../../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;row)</pre>
+<div class="block">Captures the result and if auto-close is true, closes the stream.</div>
+</li>
+</ul>
+<a name="setAutoClose-boolean-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setAutoClose</h4>
+<pre>public&nbsp;<a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a>&nbsp;setAutoClose(boolean&nbsp;arg)</pre>
+<div class="block">Whether or not to auto close the stream on the first update.  True by default, this
+ only needs to be called to disable.</div>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" target="_top">Frames</a></li>
+<li><a href="SimpleInvokeHandler.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/SimpleRequestHandler.html b/docs/javadoc/org/iot/dsa/dslink/requester/SimpleRequestHandler.html
index ad04ac87..bb226a2b 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/SimpleRequestHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/SimpleRequestHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>SimpleRequestHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>SimpleRequestHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SimpleRequestHandler (dslink-core 0.11.0 API)";
+            parent.document.title="SimpleRequestHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -180,9 +180,8 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></span>(java.lang.String&nbsp;type,
-       java.lang.String&nbsp;msg,
-       java.lang.String&nbsp;detail)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></span>(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+       java.lang.String&nbsp;msg)</code>
 <div class="block">Does nothing by default.</div>
 </td>
 </tr>
@@ -262,24 +261,23 @@ <h4>onClose</h4>
 </dl>
 </li>
 </ul>
-<a name="onError-java.lang.String-java.lang.String-java.lang.String-">
+<a name="onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>onError</h4>
-<pre>public&nbsp;void&nbsp;onError(java.lang.String&nbsp;type,
-                    java.lang.String&nbsp;msg,
-                    java.lang.String&nbsp;detail)</pre>
+<pre>public&nbsp;void&nbsp;onError(<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a>&nbsp;type,
+                    java.lang.String&nbsp;msg)</pre>
 <div class="block">Does nothing by default.
 
  <p>
 
- Callback for when an error is received.  If the stream is also closed, onClose will also be
- closed.  Does nothing by default.</div>
+ Callback for when an error is received.  onClose will also be called after this.
+ Does nothing by default.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-java.lang.String-java.lang.String-java.lang.String-">onError</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></code></dd>
+<dd><code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html#onError-org.iot.dsa.dslink.requester.ErrorType-java.lang.String-">onError</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -310,7 +308,7 @@ <h4>onError</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/package-frame.html b/docs/javadoc/org/iot/dsa/dslink/requester/package-frame.html
index 7516c6ee..c680d632 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink.requester (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink.requester (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -24,10 +24,12 @@ <h2 title="Classes">Classes</h2>
 <li><a href="AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">AbstractInvokeHandler</a></li>
 <li><a href="AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">AbstractListHandler</a></li>
 <li><a href="AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">AbstractSubscribeHandler</a></li>
+<li><a href="SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">SimpleInvokeHandler</a></li>
 <li><a href="SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester" target="classFrame">SimpleRequestHandler</a></li>
 </ul>
 <h2 title="Enums">Enums</h2>
 <ul title="Enums">
+<li><a href="ErrorType.html" title="enum in org.iot.dsa.dslink.requester" target="classFrame">ErrorType</a></li>
 <li><a href="OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester" target="classFrame">OutboundInvokeHandler.Mode</a></li>
 </ul>
 </div>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/package-summary.html b/docs/javadoc/org/iot/dsa/dslink/requester/package-summary.html
index 2ea60ef3..5ee2dae7 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink.requester (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink.requester (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.dslink.requester (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.dslink.requester (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -145,6 +145,12 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.dslink.requester</h1>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleInvokeHandler</a></td>
+<td class="colLast">
+<div class="block">Action handler for non-tables/streams.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester">SimpleRequestHandler</a></td>
 <td class="colLast">
 <div class="block">Empty callback implementations.</div>
@@ -162,6 +168,10 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.dslink.requester</h1>
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester">ErrorType</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester">OutboundInvokeHandler.Mode</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/docs/javadoc/org/iot/dsa/dslink/requester/package-tree.html b/docs/javadoc/org/iot/dsa/dslink/requester/package-tree.html
index 0164283c..d3b36136 100644
--- a/docs/javadoc/org/iot/dsa/dslink/requester/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/dslink/requester/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink.requester Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink.requester Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.dslink.requester Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.dslink.requester Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -80,7 +80,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractInvokeHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a>)</li>
+<li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractInvokeHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a>)
+<ul>
+<li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">SimpleInvokeHandler</span></a></li>
+</ul>
+</li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractListHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundListHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundListHandler</a>)</li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractSubscribeHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundSubscribeHandler</a>)</li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/SimpleRequestHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">SimpleRequestHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundRequestHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundRequestHandler</a>)</li>
@@ -104,6 +108,7 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
+<li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">ErrorType</span></a></li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="../../../../../org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">OutboundInvokeHandler.Mode</span></a></li>
 </ul>
 </li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/ApiObject.html b/docs/javadoc/org/iot/dsa/dslink/responder/ApiObject.html
index 969465d0..5d274fa9 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/ApiObject.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/ApiObject.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>ApiObject (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>ApiObject (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ApiObject (dslink-core 0.11.0 API)";
+            parent.document.title="ApiObject (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -138,9 +138,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/responder/ApiObject.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata</a></span>(<a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;metadata)</code>
-<div class="block">Add any meta-data for the object to the given map.</div>
-</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/responder/ApiObject.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata</a></span>(<a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
@@ -168,7 +166,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/responder/ApiObject.html#isConfig--">isConfig</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/responder/ApiObject.html#isAdmin--">isAdmin</a></span>()</code>
 <div class="block">Whether or not this object requires configuration permission to read/write.</div>
 </td>
 </tr>
@@ -231,8 +229,7 @@ <h4>getChildren</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMetadata</h4>
-<pre>void&nbsp;getMetadata(<a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;metadata)</pre>
-<div class="block">Add any meta-data for the object to the given map.</div>
+<pre>void&nbsp;getMetadata(<a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</pre>
 </li>
 </ul>
 <a name="getName--">
@@ -275,13 +272,13 @@ <h4>isAction</h4>
 <div class="block">True if the object is an action.</div>
 </li>
 </ul>
-<a name="isConfig--">
+<a name="isAdmin--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>isConfig</h4>
-<pre>boolean&nbsp;isConfig()</pre>
+<h4>isAdmin</h4>
+<pre>boolean&nbsp;isAdmin()</pre>
 <div class="block">Whether or not this object requires configuration permission to read/write.</div>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/InboundInvokeRequest.html b/docs/javadoc/org/iot/dsa/dslink/responder/InboundInvokeRequest.html
index 4a9de72f..ae03dba8 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/InboundInvokeRequest.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/InboundInvokeRequest.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>InboundInvokeRequest (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>InboundInvokeRequest (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InboundInvokeRequest (dslink-core 0.11.0 API)";
+            parent.document.title="InboundInvokeRequest (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -122,7 +122,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.responder.<a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundRequest</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getResponder--">getResponder</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.action.ActionInvocation">
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/InboundListRequest.html b/docs/javadoc/org/iot/dsa/dslink/responder/InboundListRequest.html
index 8bf5cb51..e9e264e5 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/InboundListRequest.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/InboundListRequest.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>InboundListRequest (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>InboundListRequest (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InboundListRequest (dslink-core 0.11.0 API)";
+            parent.document.title="InboundListRequest (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -165,7 +165,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.responder.<a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundRequest</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getResponder--">getResponder</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/InboundRequest.html b/docs/javadoc/org/iot/dsa/dslink/responder/InboundRequest.html
index f82fd3b9..9329e466 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/InboundRequest.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/InboundRequest.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>InboundRequest (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>InboundRequest (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InboundRequest (dslink-core 0.11.0 API)";
+            parent.document.title="InboundRequest (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6};
+var methods = {"i0":6,"i1":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -136,12 +136,6 @@ <h3>Method Summary</h3>
 <div class="block">Unique ID of the request, or 0 for subscriptions.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink">DSLinkSession</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getResponder--">getResponder</a></span>()</code>
-<div class="block">The corresponding session.</div>
-</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -170,23 +164,13 @@ <h4>getPath</h4>
 <a name="getRequestId--">
 <!--   -->
 </a>
-<ul class="blockList">
+<ul class="blockListLast">
 <li class="blockList">
 <h4>getRequestId</h4>
 <pre>java.lang.Integer&nbsp;getRequestId()</pre>
 <div class="block">Unique ID of the request, or 0 for subscriptions.</div>
 </li>
 </ul>
-<a name="getResponder--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>getResponder</h4>
-<pre><a href="../../../../../org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink">DSLinkSession</a>&nbsp;getResponder()</pre>
-<div class="block">The corresponding session.</div>
-</li>
-</ul>
 </li>
 </ul>
 </li>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/InboundSetRequest.html b/docs/javadoc/org/iot/dsa/dslink/responder/InboundSetRequest.html
index ee4fa0c9..ea3e3584 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/InboundSetRequest.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/InboundSetRequest.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>InboundSetRequest (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>InboundSetRequest (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InboundSetRequest (dslink-core 0.11.0 API)";
+            parent.document.title="InboundSetRequest (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -142,7 +142,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.responder.<a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundRequest</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getResponder--">getResponder</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/InboundSubscribeRequest.html b/docs/javadoc/org/iot/dsa/dslink/responder/InboundSubscribeRequest.html
index b1b153cc..519f5a79 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/InboundSubscribeRequest.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/InboundSubscribeRequest.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>InboundSubscribeRequest (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>InboundSubscribeRequest (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="InboundSubscribeRequest (dslink-core 0.11.0 API)";
+            parent.document.title="InboundSubscribeRequest (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -156,7 +156,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.dslink.responder.<a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html" title="interface in org.iot.dsa.dslink.responder">InboundRequest</a></h3>
-<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getResponder--">getResponder</a></code></li>
+<code><a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getPath--">getPath</a>, <a href="../../../../../org/iot/dsa/dslink/responder/InboundRequest.html#getRequestId--">getRequestId</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/OutboundListResponse.html b/docs/javadoc/org/iot/dsa/dslink/responder/OutboundListResponse.html
index dd86ae77..a638508c 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/OutboundListResponse.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/OutboundListResponse.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>OutboundListResponse (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>OutboundListResponse (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="OutboundListResponse (dslink-core 0.11.0 API)";
+            parent.document.title="OutboundListResponse (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html b/docs/javadoc/org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html
index 51b96793..1d4ca2ec 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/SubscriptionCloseHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>SubscriptionCloseHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>SubscriptionCloseHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SubscriptionCloseHandler (dslink-core 0.11.0 API)";
+            parent.document.title="SubscriptionCloseHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/package-frame.html b/docs/javadoc/org/iot/dsa/dslink/responder/package-frame.html
index b62d9172..d0fea562 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink.responder (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink.responder (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/package-summary.html b/docs/javadoc/org/iot/dsa/dslink/responder/package-summary.html
index 0bfcd9b8..fdc1b8c5 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink.responder (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink.responder (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.dslink.responder (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.dslink.responder (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/dslink/responder/package-tree.html b/docs/javadoc/org/iot/dsa/dslink/responder/package-tree.html
index 15110845..f4b4eb8b 100644
--- a/docs/javadoc/org/iot/dsa/dslink/responder/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/dslink/responder/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.dslink.responder Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.dslink.responder Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.dslink.responder Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.dslink.responder Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/io/AbstractReader.html b/docs/javadoc/org/iot/dsa/io/AbstractReader.html
index 4bfed66d..c56f0027 100644
--- a/docs/javadoc/org/iot/dsa/io/AbstractReader.html
+++ b/docs/javadoc/org/iot/dsa/io/AbstractReader.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>AbstractReader (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>AbstractReader (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractReader (dslink-core 0.11.0 API)";
+            parent.document.title="AbstractReader (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -112,7 +112,7 @@ <h2 title="Class AbstractReader" class="title">Class AbstractReader</h2>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json">JsonReader</a>, <a href="../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dd>
+<dd><a href="../../../../org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json">JsonReader</a></dd>
 </dl>
 <hr>
 <br>
diff --git a/docs/javadoc/org/iot/dsa/io/AbstractWriter.html b/docs/javadoc/org/iot/dsa/io/AbstractWriter.html
index 59ce44d3..bd9ee63c 100644
--- a/docs/javadoc/org/iot/dsa/io/AbstractWriter.html
+++ b/docs/javadoc/org/iot/dsa/io/AbstractWriter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>AbstractWriter (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>AbstractWriter (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractWriter (dslink-core 0.11.0 API)";
+            parent.document.title="AbstractWriter (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":10,"i25":6,"i26":6,"i27":6};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":10,"i28":6,"i29":6,"i30":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -112,7 +112,7 @@ <h2 title="Class AbstractWriter" class="title">Class AbstractWriter</h2>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a>, <a href="../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dd>
+<dd><a href="../../../../org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></dd>
 </dl>
 <hr>
 <br>
@@ -189,161 +189,179 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#beginList-int-">beginList</a></span>(int&nbsp;size)</code>
+<div class="block">Start a new list of the given size and return this.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a></span>()</code>
 <div class="block">Start a new map and return this.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#beginMap-int-">beginMap</a></span>(int&nbsp;size)</code>
+<div class="block">Start a new map of the given size and return this.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a></span>()</code>
 <div class="block">End the current list.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a></span>()</code>
 <div class="block">End the current map.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>protected int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a></span>()</code>
 <div class="block">Current depth in the tree, will be needed by writeNewLineIndent.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a></span>(java.lang.CharSequence&nbsp;arg)</code>
 <div class="block">Write a key in the current map.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#length--">length</a></span>()</code>
+<div class="block">Returns 0 by default.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#reset--">reset</a></span>()</code>
 <div class="block">Clears the state of the writer.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a></span>(boolean&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a></span>(byte[]&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a></span>(double&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-org.iot.dsa.node.DSElement-">value</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a></span>(int&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a></span>(long&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#write-boolean-">write</a></span>(boolean&nbsp;arg)</code>
 <div class="block">Write the value.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#write-byte:A-">write</a></span>(byte[]&nbsp;arg)</code>
 <div class="block">Write the value.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#write-double-">write</a></span>(double&nbsp;arg)</code>
 <div class="block">Write the value.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#write-long-">write</a></span>(long&nbsp;arg)</code>
 <div class="block">Write the value.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeKey-java.lang.CharSequence-">writeKey</a></span>(java.lang.CharSequence&nbsp;arg)</code>
 <div class="block">Write string key of a map entry.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a></span>()</code>
 <div class="block">Separate the key from the value in a map.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeListEnd--">writeListEnd</a></span>()</code>
 <div class="block">End the current list.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart--">writeListStart</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart-int-">writeListStart</a></span>(int&nbsp;size)</code>
 <div class="block">Start a new list.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeMapEnd--">writeMapEnd</a></span>()</code>
 <div class="block">End the current map.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart--">writeMapStart</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart-int-">writeMapStart</a></span>(int&nbsp;size)</code>
 <div class="block">Start a new map.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeNewLineIndent--">writeNewLineIndent</a></span>()</code>
 <div class="block">Override point for subclasses which perform use pretty printing, such as json.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeNull--">writeNull</a></span>()</code>
 <div class="block">Write a null value.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeSeparator--">writeSeparator</a></span>()</code>
 <div class="block">Write a value separator, such as the comma in json.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>protected abstract void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/AbstractWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></span>(java.lang.CharSequence&nbsp;arg)</code>
 <div class="block">Write the value, which will never be null.</div>
@@ -428,6 +446,23 @@ <h4>beginList</h4>
 </dl>
 </li>
 </ul>
+<a name="beginList-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>beginList</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a>&nbsp;beginList(int&nbsp;size)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginList-int-">DSIWriter</a></code></span></div>
+<div class="block">Start a new list of the given size and return this.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginList-int-">beginList</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>size</code> - Less than zero means the size is unknown.</dd>
+</dl>
+</li>
+</ul>
 <a name="beginMap--">
 <!--   -->
 </a>
@@ -443,6 +478,23 @@ <h4>beginMap</h4>
 </dl>
 </li>
 </ul>
+<a name="beginMap-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>beginMap</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a>&nbsp;beginMap(int&nbsp;size)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginMap-int-">DSIWriter</a></code></span></div>
+<div class="block">Start a new map of the given size and return this.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginMap-int-">beginMap</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>size</code> - Less than zero means the size is unknown.</dd>
+</dl>
+</li>
+</ul>
 <a name="endList--">
 <!--   -->
 </a>
@@ -499,6 +551,20 @@ <h4>key</h4>
 </dl>
 </li>
 </ul>
+<a name="length--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>length</h4>
+<pre>public&nbsp;int&nbsp;length()</pre>
+<div class="block">Returns 0 by default.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/io/DSIWriter.html#length--">length</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></dd>
+</dl>
+</li>
+</ul>
 <a name="reset--">
 <!--   -->
 </a>
@@ -731,13 +797,13 @@ <h4>writeListEnd</h4>
 </dl>
 </li>
 </ul>
-<a name="writeListStart--">
+<a name="writeListStart-int-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>writeListStart</h4>
-<pre>protected abstract&nbsp;void&nbsp;writeListStart()
+<pre>protected abstract&nbsp;void&nbsp;writeListStart(int&nbsp;size)
                                 throws java.io.IOException</pre>
 <div class="block">Start a new list.</div>
 <dl>
@@ -761,13 +827,13 @@ <h4>writeMapEnd</h4>
 </dl>
 </li>
 </ul>
-<a name="writeMapStart--">
+<a name="writeMapStart-int-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>writeMapStart</h4>
-<pre>protected abstract&nbsp;void&nbsp;writeMapStart()
+<pre>protected abstract&nbsp;void&nbsp;writeMapStart(int&nbsp;size)
                                throws java.io.IOException</pre>
 <div class="block">Start a new map.</div>
 <dl>
diff --git a/docs/javadoc/org/iot/dsa/io/DSBase64.html b/docs/javadoc/org/iot/dsa/io/DSBase64.html
index 2ee4af26..7de8810a 100644
--- a/docs/javadoc/org/iot/dsa/io/DSBase64.html
+++ b/docs/javadoc/org/iot/dsa/io/DSBase64.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSBase64 (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSBase64 (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSBase64 (dslink-core 0.11.0 API)";
+            parent.document.title="DSBase64 (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/io/DSBase64.html" target="_top">Frames</a></li>
@@ -111,7 +111,7 @@ <h2 title="Class DSBase64" class="title">Class DSBase64</h2>
 <pre>public class <span class="typeNameLabel">DSBase64</span>
 extends java.lang.Object</pre>
 <div class="block">Thread-safe Base64 encoder and decoder.  This only exists because we need to be compatible with
- Java 6.  While not an exact copy, it borrows heavily from the Java 8 implementation.</div>
+ Java 6.</div>
 </li>
 </ul>
 </div>
@@ -303,7 +303,7 @@ <h4>encodeUrl</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/io/DSBase64.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/io/DSByteBuffer.html b/docs/javadoc/org/iot/dsa/io/DSByteBuffer.html
deleted file mode 100644
index 06b8f65e..00000000
--- a/docs/javadoc/org/iot/dsa/io/DSByteBuffer.html
+++ /dev/null
@@ -1,540 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSByteBuffer (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSByteBuffer (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/io/DSByteBuffer.html" target="_top">Frames</a></li>
-<li><a href="DSByteBuffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.io</div>
-<h2 title="Class DSByteBuffer" class="title">Class DSByteBuffer</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.iot.dsa.io.DSByteBuffer</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">DSByteBuffer</span>
-extends java.lang.Object</pre>
-<div class="block">A buffer for storing bytes being pushed from an input stream.  Useful when bytes are coming in
- faster than can be processed.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#DSByteBuffer--">DSByteBuffer</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#DSByteBuffer-int-">DSByteBuffer</a></span>(int&nbsp;initialCapacity)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#available--">available</a></span>()</code>
-<div class="block">The number of bytes available for reading.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#close--">close</a></span>()</code>
-<div class="block">Important for notifying waiting threads.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#getTimeout--">getTimeout</a></span>()</code>
-<div class="block">Number of millis the read methods will block before throwing an IOException.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#isOpen--">isOpen</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#length--">length</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#open--">open</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#put-byte-">put</a></span>(byte&nbsp;b)</code>
-<div class="block">Add the byte to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#put-byte:A-">put</a></span>(byte[]&nbsp;msg)</code>
-<div class="block">Add bytes to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#put-byte:A-int-int-">put</a></span>(byte[]&nbsp;msg,
-   int&nbsp;off,
-   int&nbsp;len)</code>
-<div class="block">Add bytes to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#put-int-byte:A-int-int-">put</a></span>(int&nbsp;dest,
-   byte[]&nbsp;msg,
-   int&nbsp;off,
-   int&nbsp;len)</code>
-<div class="block">Overwrite bytes in the internal buffer (which begins at index 0).</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#read--">read</a></span>()</code>
-<div class="block">Returns the nextRun incoming byte, or -1 when end of stream has been reached.</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#read-byte:A-int-int-">read</a></span>(byte[]&nbsp;buf,
-    int&nbsp;off,
-    int&nbsp;len)</code>
-<div class="block">Reads incoming bytes into the given buffer.</div>
-</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#setTimeout-long-">setTimeout</a></span>(long&nbsp;timeout)</code>
-<div class="block">Number of millis the read methods will block before throwing an DSIoException.</div>
-</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html#toByteArray--">toByteArray</a></span>()</code>
-<div class="block">Returns a new array.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="DSByteBuffer--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DSByteBuffer</h4>
-<pre>public&nbsp;DSByteBuffer()</pre>
-</li>
-</ul>
-<a name="DSByteBuffer-int-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DSByteBuffer</h4>
-<pre>public&nbsp;DSByteBuffer(int&nbsp;initialCapacity)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="available--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>available</h4>
-<pre>public&nbsp;int&nbsp;available()</pre>
-<div class="block">The number of bytes available for reading.</div>
-</li>
-</ul>
-<a name="close--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>close</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a>&nbsp;close()</pre>
-<div class="block">Important for notifying waiting threads.</div>
-</li>
-</ul>
-<a name="getTimeout--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTimeout</h4>
-<pre>public&nbsp;long&nbsp;getTimeout()</pre>
-<div class="block">Number of millis the read methods will block before throwing an IOException.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>Zero or less is indefinite.</dd>
-</dl>
-</li>
-</ul>
-<a name="isOpen--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isOpen</h4>
-<pre>public&nbsp;boolean&nbsp;isOpen()</pre>
-</li>
-</ul>
-<a name="length--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>length</h4>
-<pre>public&nbsp;int&nbsp;length()</pre>
-</li>
-</ul>
-<a name="open--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>open</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a>&nbsp;open()</pre>
-</li>
-</ul>
-<a name="put-byte-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(byte&nbsp;b)</pre>
-<div class="block">Add the byte to the buffer for reading.</div>
-</li>
-</ul>
-<a name="put-byte:A-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(byte[]&nbsp;msg)</pre>
-<div class="block">Add bytes to the buffer for reading.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>msg</code> - The data source.</dd>
-</dl>
-</li>
-</ul>
-<a name="put-byte:A-int-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(byte[]&nbsp;msg,
-                int&nbsp;off,
-                int&nbsp;len)</pre>
-<div class="block">Add bytes to the buffer for reading.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>msg</code> - The data source.</dd>
-<dd><code>off</code> - The start offset in the buffer to put data.</dd>
-<dd><code>len</code> - The maximum number of bytes to read.</dd>
-</dl>
-</li>
-</ul>
-<a name="put-int-byte:A-int-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(int&nbsp;dest,
-                byte[]&nbsp;msg,
-                int&nbsp;off,
-                int&nbsp;len)</pre>
-<div class="block">Overwrite bytes in the internal buffer (which begins at index 0).</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>dest</code> - The internal destination offset.</dd>
-<dd><code>msg</code> - The data source.</dd>
-<dd><code>off</code> - The start offset in the msg to put data.</dd>
-<dd><code>len</code> - The maximum number of bytes to read.</dd>
-</dl>
-</li>
-</ul>
-<a name="read--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>read</h4>
-<pre>public&nbsp;int&nbsp;read()</pre>
-<div class="block">Returns the nextRun incoming byte, or -1 when end of stream has been reached.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></code> - if there are any issues.</dd>
-</dl>
-</li>
-</ul>
-<a name="read-byte:A-int-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>read</h4>
-<pre>public&nbsp;int&nbsp;read(byte[]&nbsp;buf,
-                int&nbsp;off,
-                int&nbsp;len)</pre>
-<div class="block">Reads incoming bytes into the given buffer.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>buf</code> - The buffer into which data is read.</dd>
-<dd><code>off</code> - The start offset in the buffer to put data.</dd>
-<dd><code>len</code> - The maximum number of bytes to read.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The number of bytes read or -1 for end of stream.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></code> - if there are any issues.</dd>
-</dl>
-</li>
-</ul>
-<a name="setTimeout-long-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setTimeout</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a>&nbsp;setTimeout(long&nbsp;timeout)</pre>
-<div class="block">Number of millis the read methods will block before throwing an DSIoException.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>timeout</code> - Zero or less for indefinite.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This</dd>
-</dl>
-</li>
-</ul>
-<a name="toByteArray--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>toByteArray</h4>
-<pre>public&nbsp;byte[]&nbsp;toByteArray()</pre>
-<div class="block">Returns a new array.</div>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/io/DSByteBuffer.html" target="_top">Frames</a></li>
-<li><a href="DSByteBuffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/io/DSCharBuffer.html b/docs/javadoc/org/iot/dsa/io/DSCharBuffer.html
deleted file mode 100644
index 2b38eb89..00000000
--- a/docs/javadoc/org/iot/dsa/io/DSCharBuffer.html
+++ /dev/null
@@ -1,498 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSCharBuffer (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSCharBuffer (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/io/DSCharBuffer.html" target="_top">Frames</a></li>
-<li><a href="DSCharBuffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.io</div>
-<h2 title="Class DSCharBuffer" class="title">Class DSCharBuffer</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li>org.iot.dsa.io.DSCharBuffer</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">DSCharBuffer</span>
-extends java.lang.Object</pre>
-<div class="block">A buffer for storing chars being pushed from a reader.  Useful when chars are coming in faster
- than can be processed.</div>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#DSCharBuffer--">DSCharBuffer</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#DSCharBuffer-int-">DSCharBuffer</a></span>(int&nbsp;initialCapacity)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#available--">available</a></span>()</code>
-<div class="block">The number of chars available for reading.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#close--">close</a></span>()</code>
-<div class="block">Important for notifying waiting threads.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#getTimeout--">getTimeout</a></span>()</code>
-<div class="block">Number of millis the read methods will block before throwing an IOException.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#isOpen--">isOpen</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#open--">open</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#put-char-">put</a></span>(char&nbsp;b)</code>
-<div class="block">Add the char to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#put-char:A-">put</a></span>(char[]&nbsp;msg)</code>
-<div class="block">Add chars to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#put-char:A-int-int-">put</a></span>(char[]&nbsp;msg,
-   int&nbsp;off,
-   int&nbsp;len)</code>
-<div class="block">Add chars to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#put-java.lang.String-">put</a></span>(java.lang.String&nbsp;msg)</code>
-<div class="block">Add chars to the buffer for reading.</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#read--">read</a></span>()</code>
-<div class="block">Returns the next incoming char, or -1 when end of stream has been reached.</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#read-char:A-int-int-">read</a></span>(char[]&nbsp;buf,
-    int&nbsp;off,
-    int&nbsp;len)</code>
-<div class="block">Reads incoming chars into the given buffer.</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html#setTimeout-long-">setTimeout</a></span>(long&nbsp;timeout)</code>
-<div class="block">Number of millis the read methods will block before throwing an DSIoException.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="DSCharBuffer--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>DSCharBuffer</h4>
-<pre>public&nbsp;DSCharBuffer()</pre>
-</li>
-</ul>
-<a name="DSCharBuffer-int-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DSCharBuffer</h4>
-<pre>public&nbsp;DSCharBuffer(int&nbsp;initialCapacity)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="available--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>available</h4>
-<pre>public&nbsp;int&nbsp;available()</pre>
-<div class="block">The number of chars available for reading.</div>
-</li>
-</ul>
-<a name="close--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>close</h4>
-<pre>public&nbsp;void&nbsp;close()</pre>
-<div class="block">Important for notifying waiting threads.</div>
-</li>
-</ul>
-<a name="getTimeout--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getTimeout</h4>
-<pre>public&nbsp;long&nbsp;getTimeout()</pre>
-<div class="block">Number of millis the read methods will block before throwing an IOException.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>Zero or less is indefinite.</dd>
-</dl>
-</li>
-</ul>
-<a name="isOpen--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isOpen</h4>
-<pre>public&nbsp;boolean&nbsp;isOpen()</pre>
-</li>
-</ul>
-<a name="open--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>open</h4>
-<pre>public&nbsp;void&nbsp;open()</pre>
-</li>
-</ul>
-<a name="put-char-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(char&nbsp;b)</pre>
-<div class="block">Add the char to the buffer for reading.</div>
-</li>
-</ul>
-<a name="put-char:A-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(char[]&nbsp;msg)</pre>
-<div class="block">Add chars to the buffer for reading.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>msg</code> - The data source.</dd>
-</dl>
-</li>
-</ul>
-<a name="put-char:A-int-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(char[]&nbsp;msg,
-                int&nbsp;off,
-                int&nbsp;len)</pre>
-<div class="block">Add chars to the buffer for reading.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>msg</code> - The data source.</dd>
-<dd><code>off</code> - The start offset in the buffer to put data.</dd>
-<dd><code>len</code> - The maximum number of chars to read.</dd>
-</dl>
-</li>
-</ul>
-<a name="put-java.lang.String-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>put</h4>
-<pre>public&nbsp;void&nbsp;put(java.lang.String&nbsp;msg)</pre>
-<div class="block">Add chars to the buffer for reading.</div>
-</li>
-</ul>
-<a name="read--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>read</h4>
-<pre>public&nbsp;int&nbsp;read()</pre>
-<div class="block">Returns the next incoming char, or -1 when end of stream has been reached.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></code> - if there are any issues.</dd>
-</dl>
-</li>
-</ul>
-<a name="read-char:A-int-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>read</h4>
-<pre>public&nbsp;int&nbsp;read(char[]&nbsp;buf,
-                int&nbsp;off,
-                int&nbsp;len)</pre>
-<div class="block">Reads incoming chars into the given buffer.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>buf</code> - The buffer into which data is read.</dd>
-<dd><code>off</code> - The start offset in the buffer to put data.</dd>
-<dd><code>len</code> - The maximum number of chars to read.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>The number of chars read or -1 for end of stream.</dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></code> - if there are any issues.</dd>
-</dl>
-</li>
-</ul>
-<a name="setTimeout-long-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setTimeout</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a>&nbsp;setTimeout(long&nbsp;timeout)</pre>
-<div class="block">Number of millis the read methods will block before throwing an DSIoException.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>timeout</code> - Zero or less for indefinite.</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>This</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/io/DSCharBuffer.html" target="_top">Frames</a></li>
-<li><a href="DSCharBuffer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/io/DSIReader.Token.html b/docs/javadoc/org/iot/dsa/io/DSIReader.Token.html
index a3765586..4e53e9d3 100644
--- a/docs/javadoc/org/iot/dsa/io/DSIReader.Token.html
+++ b/docs/javadoc/org/iot/dsa/io/DSIReader.Token.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSIReader.Token (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSIReader.Token (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIReader.Token (dslink-core 0.11.0 API)";
+            parent.document.title="DSIReader.Token (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/io/DSIReader.html b/docs/javadoc/org/iot/dsa/io/DSIReader.html
index 3cb8083c..ab5cf0da 100644
--- a/docs/javadoc/org/iot/dsa/io/DSIReader.html
+++ b/docs/javadoc/org/iot/dsa/io/DSIReader.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSIReader (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSIReader (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIReader (dslink-core 0.11.0 API)";
+            parent.document.title="DSIReader (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -104,7 +104,7 @@ <h2 title="Interface DSIReader" class="title">Interface DSIReader</h2>
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a>, <a href="../../../../org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json">JsonReader</a>, <a href="../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></dd>
+<dd><a href="../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a>, <a href="../../../../org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json">JsonReader</a></dd>
 </dl>
 <hr>
 <br>
@@ -426,7 +426,7 @@ <h4>reset</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/io/DSIWriter.html b/docs/javadoc/org/iot/dsa/io/DSIWriter.html
index b8e11442..5744d1d8 100644
--- a/docs/javadoc/org/iot/dsa/io/DSIWriter.html
+++ b/docs/javadoc/org/iot/dsa/io/DSIWriter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>DSIWriter (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>DSIWriter (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIWriter (dslink-core 0.11.0 API)";
+            parent.document.title="DSIWriter (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -104,7 +104,7 @@ <h2 title="Interface DSIWriter" class="title">Interface DSIWriter</h2>
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a>, <a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a>, <a href="../../../../org/iot/dsa/io/json/JsonAppender.html" title="class in org.iot.dsa.io.json">JsonAppender</a>, <a href="../../../../org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json">JsonWriter</a>, <a href="../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></dd>
+<dd><a href="../../../../org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a>, <a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a>, <a href="../../../../org/iot/dsa/io/json/JsonAppender.html" title="class in org.iot.dsa.io.json">JsonAppender</a>, <a href="../../../../org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json">JsonWriter</a></dd>
 </dl>
 <hr>
 <br>
@@ -165,83 +165,101 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginList-int-">beginList</a></span>(int&nbsp;size)</code>
+<div class="block">Start a new list of the given size and return this.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a></span>()</code>
 <div class="block">Start a new map and return this.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#beginMap-int-">beginMap</a></span>(int&nbsp;size)</code>
+<div class="block">Start a new map of the given size and return this.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#close--">close</a></span>()</code>
 <div class="block">Close the stream.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a></span>()</code>
 <div class="block">End the current list.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a></span>()</code>
 <div class="block">End the current map.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#flush--">flush</a></span>()</code>
 <div class="block">Flush the stream.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a></span>(java.lang.CharSequence&nbsp;key)</code>
 <div class="block">Write a key in the current map.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#length--">length</a></span>()</code>
+<div class="block">If the writer is buffering output, this returns the size of that buffer.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#reset--">reset</a></span>()</code>
 <div class="block">Clears the state of the writer.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a></span>(boolean&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a></span>(byte[]&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a></span>(double&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-org.iot.dsa.node.DSElement-">value</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a></span>(int&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a></span>(long&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Write a value to the map or list.</div>
@@ -276,6 +294,22 @@ <h4>beginList</h4>
 </dl>
 </li>
 </ul>
+<a name="beginList-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>beginList</h4>
+<pre><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a>&nbsp;beginList(int&nbsp;size)</pre>
+<div class="block">Start a new list of the given size and return this.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>size</code> - Less than zero means the size is unknown.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalStateException</code> - when improperly called.</dd>
+</dl>
+</li>
+</ul>
 <a name="beginMap--">
 <!--   -->
 </a>
@@ -290,6 +324,22 @@ <h4>beginMap</h4>
 </dl>
 </li>
 </ul>
+<a name="beginMap-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>beginMap</h4>
+<pre><a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a>&nbsp;beginMap(int&nbsp;size)</pre>
+<div class="block">Start a new map of the given size and return this.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>size</code> - Less than zero means the size is unknown.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalStateException</code> - when improperly called.</dd>
+</dl>
+</li>
+</ul>
 <a name="close--">
 <!--   -->
 </a>
@@ -359,6 +409,16 @@ <h4>key</h4>
 </dl>
 </li>
 </ul>
+<a name="length--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>length</h4>
+<pre>int&nbsp;length()</pre>
+<div class="block">If the writer is buffering output, this returns the size of that buffer.</div>
+</li>
+</ul>
 <a name="reset--">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/io/NodeDecoder.html b/docs/javadoc/org/iot/dsa/io/NodeDecoder.html
index 28a7538c..b75b0bae 100644
--- a/docs/javadoc/org/iot/dsa/io/NodeDecoder.html
+++ b/docs/javadoc/org/iot/dsa/io/NodeDecoder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>NodeDecoder (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>NodeDecoder (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NodeDecoder (dslink-core 0.11.0 API)";
+            parent.document.title="NodeDecoder (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/io/NodeEncoder.html b/docs/javadoc/org/iot/dsa/io/NodeEncoder.html
index c8f3c7a3..b565ad6c 100644
--- a/docs/javadoc/org/iot/dsa/io/NodeEncoder.html
+++ b/docs/javadoc/org/iot/dsa/io/NodeEncoder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>NodeEncoder (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:08 PST 2018 -->
+<title>NodeEncoder (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="NodeEncoder (dslink-core 0.11.0 API)";
+            parent.document.title="NodeEncoder (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/io/json/AbstractJsonWriter.html b/docs/javadoc/org/iot/dsa/io/json/AbstractJsonWriter.html
index 40a3d5af..80798127 100644
--- a/docs/javadoc/org/iot/dsa/io/json/AbstractJsonWriter.html
+++ b/docs/javadoc/org/iot/dsa/io/json/AbstractJsonWriter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>AbstractJsonWriter (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>AbstractJsonWriter (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AbstractJsonWriter (dslink-core 0.11.0 API)";
+            parent.document.title="AbstractJsonWriter (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -243,7 +243,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart--">writeListStart</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart-int-">writeListStart</a></span>(int&nbsp;size)</code>
 <div class="block">Start a new list.</div>
 </td>
 </tr>
@@ -255,7 +255,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart--">writeMapStart</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart-int-">writeMapStart</a></span>(int&nbsp;size)</code>
 <div class="block">Start a new map.</div>
 </td>
 </tr>
@@ -289,7 +289,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#reset--">reset</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList-int-">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap-int-">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#length--">length</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#reset--">reset</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -310,7 +310,7 @@ <h3>Methods inherited from interface&nbsp;java.lang.Appendable</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#close--">close</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#flush--">flush</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#reset--">reset</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList-int-">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap-int-">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#close--">close</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#flush--">flush</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#length--">length</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#reset--">reset</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></code></li>
 </ul>
 </li>
 </ul>
@@ -542,19 +542,19 @@ <h4>writeListEnd</h4>
 </dl>
 </li>
 </ul>
-<a name="writeListStart--">
+<a name="writeListStart-int-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>writeListStart</h4>
-<pre>protected&nbsp;void&nbsp;writeListStart()
+<pre>protected&nbsp;void&nbsp;writeListStart(int&nbsp;size)
                        throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart--">AbstractWriter</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart-int-">AbstractWriter</a></code></span></div>
 <div class="block">Start a new list.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart--">writeListStart</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
+<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart-int-">writeListStart</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>java.io.IOException</code></dd>
 </dl>
@@ -578,19 +578,19 @@ <h4>writeMapEnd</h4>
 </dl>
 </li>
 </ul>
-<a name="writeMapStart--">
+<a name="writeMapStart-int-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>writeMapStart</h4>
-<pre>protected&nbsp;void&nbsp;writeMapStart()
+<pre>protected&nbsp;void&nbsp;writeMapStart(int&nbsp;size)
                       throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart--">AbstractWriter</a></code></span></div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart-int-">AbstractWriter</a></code></span></div>
 <div class="block">Start a new map.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart--">writeMapStart</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
+<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart-int-">writeMapStart</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code>java.io.IOException</code></dd>
 </dl>
diff --git a/docs/javadoc/org/iot/dsa/io/json/JsonAppender.html b/docs/javadoc/org/iot/dsa/io/json/JsonAppender.html
index d29769c1..47ea90d6 100644
--- a/docs/javadoc/org/iot/dsa/io/json/JsonAppender.html
+++ b/docs/javadoc/org/iot/dsa/io/json/JsonAppender.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>JsonAppender (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>JsonAppender (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JsonAppender (dslink-core 0.11.0 API)";
+            parent.document.title="JsonAppender (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -303,14 +303,14 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.io.json.<a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#setPrettyPrint-boolean-">setPrettyPrint</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#value-org.iot.dsa.node.DSElement-">value</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-boolean-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-byte:A-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-double-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-long-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKey-java.lang.CharSequence-">writeKey</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListEnd--">writeListEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart--">writeListStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapEnd--">writeMapEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart--">writeMapStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNewLineIndent--">writeNewLineIndent</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNull--">writeNull</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeSeparator--">writeSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#setPrettyPrint-boolean-">setPrettyPrint</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#value-org.iot.dsa.node.DSElement-">value</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-boolean-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-byte:A-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-double-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-long-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKey-java.lang.CharSequence-">writeKey</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListEnd--">writeListEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart-int-">writeListStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapEnd--">writeMapEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart-int-">writeMapStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNewLineIndent--">writeNewLineIndent</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNull--">writeNull</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeSeparator--">writeSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.io.AbstractWriter">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList-int-">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap-int-">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#length--">length</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -324,7 +324,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList-int-">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap-int-">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#length--">length</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></code></li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/io/json/JsonConstants.html b/docs/javadoc/org/iot/dsa/io/json/JsonConstants.html
index b83c882a..425924ea 100644
--- a/docs/javadoc/org/iot/dsa/io/json/JsonConstants.html
+++ b/docs/javadoc/org/iot/dsa/io/json/JsonConstants.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>JsonConstants (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>JsonConstants (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JsonConstants (dslink-core 0.11.0 API)";
+            parent.document.title="JsonConstants (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/io/json/JsonReader.html b/docs/javadoc/org/iot/dsa/io/json/JsonReader.html
index 92796161..ca3035b0 100644
--- a/docs/javadoc/org/iot/dsa/io/json/JsonReader.html
+++ b/docs/javadoc/org/iot/dsa/io/json/JsonReader.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>JsonReader (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>JsonReader (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JsonReader (dslink-core 0.11.0 API)";
+            parent.document.title="JsonReader (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/io/json/JsonWriter.html b/docs/javadoc/org/iot/dsa/io/json/JsonWriter.html
index cb69a8a6..3ae21204 100644
--- a/docs/javadoc/org/iot/dsa/io/json/JsonWriter.html
+++ b/docs/javadoc/org/iot/dsa/io/json/JsonWriter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:38 PST 2017 -->
-<title>JsonWriter (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>JsonWriter (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="JsonWriter (dslink-core 0.11.0 API)";
+            parent.document.title="JsonWriter (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -197,6 +197,9 @@ <h3>Constructor Summary</h3>
 <div class="block">Will write a zip file to the given stream.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/json/JsonWriter.html#JsonWriter-java.io.Writer-">JsonWriter</a></span>(java.io.Writer&nbsp;out)</code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -292,14 +295,14 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.io.json.<a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html" title="class in org.iot.dsa.io.json">AbstractJsonWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#setPrettyPrint-boolean-">setPrettyPrint</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#value-org.iot.dsa.node.DSElement-">value</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-boolean-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-byte:A-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-double-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-long-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKey-java.lang.CharSequence-">writeKey</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListEnd--">writeListEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart--">writeListStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapEnd--">writeMapEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart--">writeMapStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNewLineIndent--">writeNewLineIndent</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNull--">writeNull</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeSeparator--">writeSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#setPrettyPrint-boolean-">setPrettyPrint</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#value-org.iot.dsa.node.DSElement-">value</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-boolean-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-byte:A-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-double-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#write-long-">write</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKey-java.lang.CharSequence-">writeKey</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListEnd--">writeListEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeListStart-int-">writeListStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapEnd--">writeMapEnd</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeMapStart-int-">writeMapStart</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNewLineIndent--">writeNewLineIndent</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeNull--">writeNull</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeSeparator--">writeSeparator</a>, <a href="../../../../../org/iot/dsa/io/json/AbstractJsonWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.io.AbstractWriter">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList-int-">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap-int-">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#length--">length</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -313,7 +316,7 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></code></li>
+<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginList-int-">beginList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#beginMap-int-">beginMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#length--">length</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#value-java.lang.String-">value</a></code></li>
 </ul>
 </li>
 </ul>
@@ -373,7 +376,7 @@ <h4>JsonWriter</h4>
 <a name="JsonWriter-java.io.OutputStream-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>JsonWriter</h4>
 <pre>public&nbsp;JsonWriter(java.io.OutputStream&nbsp;out,
@@ -381,6 +384,15 @@ <h4>JsonWriter</h4>
 <div class="block">Will write a zip file to the given stream.</div>
 </li>
 </ul>
+<a name="JsonWriter-java.io.Writer-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>JsonWriter</h4>
+<pre>public&nbsp;JsonWriter(java.io.Writer&nbsp;out)</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ============ METHOD DETAIL ========== -->
diff --git a/docs/javadoc/org/iot/dsa/io/json/package-frame.html b/docs/javadoc/org/iot/dsa/io/json/package-frame.html
index e297d031..28bcadd9 100644
--- a/docs/javadoc/org/iot/dsa/io/json/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/io/json/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io.json (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.io.json (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
diff --git a/docs/javadoc/org/iot/dsa/io/json/package-summary.html b/docs/javadoc/org/iot/dsa/io/json/package-summary.html
index 88d164c9..b4f43f2d 100644
--- a/docs/javadoc/org/iot/dsa/io/json/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/io/json/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io.json (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.io.json (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.io.json (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.io.json (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/io/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/iot/dsa/io/msgpack/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/logging/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/io/json/package-summary.html" target="_top">Frames</a></li>
@@ -146,7 +146,7 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io.json</h1>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/io/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/iot/dsa/io/msgpack/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/logging/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/io/json/package-summary.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/io/json/package-tree.html b/docs/javadoc/org/iot/dsa/io/json/package-tree.html
index f85af1db..e14c91d6 100644
--- a/docs/javadoc/org/iot/dsa/io/json/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/io/json/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io.json Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.io.json Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.io.json Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.io.json Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/io/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/iot/dsa/io/msgpack/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/iot/dsa/logging/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/io/json/package-tree.html" target="_top">Frames</a></li>
@@ -124,7 +124,7 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/io/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/iot/dsa/io/msgpack/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/iot/dsa/logging/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/io/json/package-tree.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/io/msgpack/MsgpackReader.html b/docs/javadoc/org/iot/dsa/io/msgpack/MsgpackReader.html
deleted file mode 100644
index 98052d75..00000000
--- a/docs/javadoc/org/iot/dsa/io/msgpack/MsgpackReader.html
+++ /dev/null
@@ -1,930 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>MsgpackReader (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MsgpackReader (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":9,"i2":9,"i3":9,"i4":9,"i5":10,"i6":10,"i7":10};
-var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/MsgpackReader.html" target="_top">Frames</a></li>
-<li><a href="MsgpackReader.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.io.msgpack</div>
-<h2 title="Class MsgpackReader" class="title">Class MsgpackReader</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">org.iot.dsa.io.AbstractReader</a></li>
-<li>
-<ul class="inheritance">
-<li>org.iot.dsa.io.msgpack.MsgpackReader</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.io.Closeable, java.lang.AutoCloseable, <a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public class <span class="typeNameLabel">MsgpackReader</span>
-extends <a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a>
-implements <a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></pre>
-<div class="block">MsgPack implementation of DSReader.  The same instance can be re-used with the setInput method.
- This class is not thread safe.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io"><code>DSIReader</code></a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
-<!--   -->
-</a>
-<h3>Nested Class Summary</h3>
-<ul class="blockList">
-<li class="blockList"><a name="nested.classes.inherited.from.class.org.iot.dsa.io.DSIReader">
-<!--   -->
-</a>
-<h3>Nested classes/interfaces inherited from interface&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io">DSIReader.Token</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#BIN16">BIN16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#BIN32">BIN32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#BIN8">BIN8</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#FALSE">FALSE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#FIXLIST_PREFIX">FIXLIST_PREFIX</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#FIXMAP_PREFIX">FIXMAP_PREFIX</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#FIXSTR_PREFIX">FIXSTR_PREFIX</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#FLOAT32">FLOAT32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#FLOAT64">FLOAT64</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#INT16">INT16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#INT32">INT32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#INT64">INT64</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#INT8">INT8</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#LIST16">LIST16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#LIST32">LIST32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#MAP16">MAP16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#MAP32">MAP32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#NULL">NULL</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#STR16">STR16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#STR32">STR32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#STR8">STR8</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#TRUE">TRUE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#UINT16">UINT16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#UINT32">UINT32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#UINT64">UINT64</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#UINT8">UINT8</a></span></code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.io.AbstractReader">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractReader.html#valBoolean">valBoolean</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#valBytes">valBytes</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#valLong">valLong</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#valReal">valReal</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#valString">valString</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#MsgpackReader--">MsgpackReader</a></span>()</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#MsgpackReader-java.io.InputStream-">MsgpackReader</a></span>(java.io.InputStream&nbsp;in)</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#close--">close</a></span>()</code>
-<div class="block">Close the input.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#isFixedList-byte-">isFixedList</a></span>(byte&nbsp;b)</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#isFixedMap-byte-">isFixedMap</a></span>(byte&nbsp;b)</code>&nbsp;</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#isFixInt-byte-">isFixInt</a></span>(byte&nbsp;b)</code>&nbsp;</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#isFixStr-byte-">isFixStr</a></span>(byte&nbsp;b)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io">DSIReader.Token</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#next--">next</a></span>()</code>
-<div class="block">Subclasses must override this, read the next item from the stream, then call one of the
- setXxx methods.</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#reset--">reset</a></span>()</code>
-<div class="block">Sets last() == ROOT.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html#setInput-java.io.InputStream-">setInput</a></span>(java.io.InputStream&nbsp;inputStream)</code>
-<div class="block">Sets the input source, resets to ROOT, and returns this.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.io.AbstractReader">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractReader.html#getBoolean--">getBoolean</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getBytes--">getBytes</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getDouble--">getDouble</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getElement--">getElement</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getList--">getList</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getLong--">getLong</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getMap--">getMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#getString--">getString</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#last--">last</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setBeginList--">setBeginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setBeginMap--">setBeginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setEndInput--">setEndInput</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setEndList--">setEndList</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setEndMap--">setEndMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setNextValue-boolean-">setNextValue</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setNextValue-byte:A-">setNextValue</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setNextValue-double-">setNextValue</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setNextValue-long-">setNextValue</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setNextValue-java.lang.String-">setNextValue</a>, <a href="../../../../../org/iot/dsa/io/AbstractReader.html#setNextValueNull--">setNextValueNull</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.io.DSIReader">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/DSIReader.html#getBoolean--">getBoolean</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getBytes--">getBytes</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getDouble--">getDouble</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getElement--">getElement</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getList--">getList</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getLong--">getLong</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getMap--">getMap</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#getString--">getString</a>, <a href="../../../../../org/iot/dsa/io/DSIReader.html#last--">last</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="FIXMAP_PREFIX">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FIXMAP_PREFIX</h4>
-<pre>public static final&nbsp;byte FIXMAP_PREFIX</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.FIXMAP_PREFIX">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FIXLIST_PREFIX">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FIXLIST_PREFIX</h4>
-<pre>public static final&nbsp;byte FIXLIST_PREFIX</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.FIXLIST_PREFIX">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FIXSTR_PREFIX">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FIXSTR_PREFIX</h4>
-<pre>public static final&nbsp;byte FIXSTR_PREFIX</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.FIXSTR_PREFIX">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="NULL">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>NULL</h4>
-<pre>public static final&nbsp;byte NULL</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.NULL">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FALSE">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FALSE</h4>
-<pre>public static final&nbsp;byte FALSE</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.FALSE">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="TRUE">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>TRUE</h4>
-<pre>public static final&nbsp;byte TRUE</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.TRUE">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="BIN8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>BIN8</h4>
-<pre>public static final&nbsp;byte BIN8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.BIN8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="BIN16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>BIN16</h4>
-<pre>public static final&nbsp;byte BIN16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.BIN16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="BIN32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>BIN32</h4>
-<pre>public static final&nbsp;byte BIN32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.BIN32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FLOAT32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FLOAT32</h4>
-<pre>public static final&nbsp;byte FLOAT32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.FLOAT32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FLOAT64">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FLOAT64</h4>
-<pre>public static final&nbsp;byte FLOAT64</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.FLOAT64">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT8</h4>
-<pre>public static final&nbsp;byte UINT8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.UINT8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT16</h4>
-<pre>public static final&nbsp;byte UINT16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.UINT16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT32</h4>
-<pre>public static final&nbsp;byte UINT32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.UINT32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT64">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT64</h4>
-<pre>public static final&nbsp;byte UINT64</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.UINT64">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT8</h4>
-<pre>public static final&nbsp;byte INT8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.INT8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT16</h4>
-<pre>public static final&nbsp;byte INT16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.INT16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT32</h4>
-<pre>public static final&nbsp;byte INT32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.INT32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT64">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT64</h4>
-<pre>public static final&nbsp;byte INT64</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.INT64">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="STR8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>STR8</h4>
-<pre>public static final&nbsp;byte STR8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.STR8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="STR16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>STR16</h4>
-<pre>public static final&nbsp;byte STR16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.STR16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="STR32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>STR32</h4>
-<pre>public static final&nbsp;byte STR32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.STR32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="LIST16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>LIST16</h4>
-<pre>public static final&nbsp;byte LIST16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.LIST16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="LIST32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>LIST32</h4>
-<pre>public static final&nbsp;byte LIST32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.LIST32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MAP16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>MAP16</h4>
-<pre>public static final&nbsp;byte MAP16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.MAP16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MAP32">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MAP32</h4>
-<pre>public static final&nbsp;byte MAP32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackReader.MAP32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MsgpackReader--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>MsgpackReader</h4>
-<pre>public&nbsp;MsgpackReader()</pre>
-</li>
-</ul>
-<a name="MsgpackReader-java.io.InputStream-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MsgpackReader</h4>
-<pre>public&nbsp;MsgpackReader(java.io.InputStream&nbsp;in)</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="close--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>close</h4>
-<pre>public&nbsp;void&nbsp;close()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/iot/dsa/io/DSIReader.html#close--">DSIReader</a></code></span></div>
-<div class="block">Close the input.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>close</code>&nbsp;in interface&nbsp;<code>java.io.Closeable</code></dd>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code>close</code>&nbsp;in interface&nbsp;<code>java.lang.AutoCloseable</code></dd>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/DSIReader.html#close--">close</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="isFixInt-byte-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isFixInt</h4>
-<pre>public static final&nbsp;boolean&nbsp;isFixInt(byte&nbsp;b)</pre>
-</li>
-</ul>
-<a name="isFixStr-byte-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isFixStr</h4>
-<pre>public static final&nbsp;boolean&nbsp;isFixStr(byte&nbsp;b)</pre>
-</li>
-</ul>
-<a name="isFixedList-byte-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isFixedList</h4>
-<pre>public static final&nbsp;boolean&nbsp;isFixedList(byte&nbsp;b)</pre>
-</li>
-</ul>
-<a name="isFixedMap-byte-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>isFixedMap</h4>
-<pre>public static final&nbsp;boolean&nbsp;isFixedMap(byte&nbsp;b)</pre>
-</li>
-</ul>
-<a name="next--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>next</h4>
-<pre>public&nbsp;<a href="../../../../../org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io">DSIReader.Token</a>&nbsp;next()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractReader.html#next--">AbstractReader</a></code></span></div>
-<div class="block">Subclasses must override this, read the next item from the stream, then call one of the
- setXxx methods.
-
- <p>
-
- Advances the reader to the next item and returns the token representing it's current state.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/DSIReader.html#next--">next</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractReader.html#next--">next</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="reset--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>reset</h4>
-<pre>public&nbsp;<a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a>&nbsp;reset()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/iot/dsa/io/DSIReader.html#reset--">DSIReader</a></code></span></div>
-<div class="block">Sets last() == ROOT.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/DSIReader.html#reset--">reset</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractReader.html#reset--">reset</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io">AbstractReader</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="setInput-java.io.InputStream-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>setInput</h4>
-<pre>public&nbsp;<a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a>&nbsp;setInput(java.io.InputStream&nbsp;inputStream)</pre>
-<div class="block">Sets the input source, resets to ROOT, and returns this.</div>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev&nbsp;Class</li>
-<li><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/MsgpackReader.html" target="_top">Frames</a></li>
-<li><a href="MsgpackReader.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/io/msgpack/MsgpackWriter.html b/docs/javadoc/org/iot/dsa/io/msgpack/MsgpackWriter.html
deleted file mode 100644
index c2c4eeaa..00000000
--- a/docs/javadoc/org/iot/dsa/io/msgpack/MsgpackWriter.html
+++ /dev/null
@@ -1,1165 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>MsgpackWriter (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="MsgpackWriter (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/MsgpackWriter.html" target="_top">Frames</a></li>
-<li><a href="MsgpackWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.io.msgpack</div>
-<h2 title="Class MsgpackWriter" class="title">Class MsgpackWriter</h2>
-</div>
-<div class="contentContainer">
-<ul class="inheritance">
-<li>java.lang.Object</li>
-<li>
-<ul class="inheritance">
-<li><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">org.iot.dsa.io.AbstractWriter</a></li>
-<li>
-<ul class="inheritance">
-<li>org.iot.dsa.io.msgpack.MsgpackWriter</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<dl>
-<dt>All Implemented Interfaces:</dt>
-<dd>java.io.Closeable, java.lang.AutoCloseable, <a href="../../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></dd>
-</dl>
-<hr>
-<br>
-<pre>public abstract class <span class="typeNameLabel">MsgpackWriter</span>
-extends <a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></pre>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- =========== FIELD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.summary">
-<!--   -->
-</a>
-<h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
-<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#BIN16">BIN16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#BIN32">BIN32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#BIN8">BIN8</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#FALSE">FALSE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#FIXLIST_PREFIX">FIXLIST_PREFIX</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#FIXMAP_PREFIX">FIXMAP_PREFIX</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#FIXSTR_PREFIX">FIXSTR_PREFIX</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#FLOAT32">FLOAT32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#FLOAT64">FLOAT64</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#INT16">INT16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#INT32">INT32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#INT64">INT64</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#INT8">INT8</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#LIST16">LIST16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#LIST32">LIST32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#MAP16">MAP16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#MAP32">MAP32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#NULL">NULL</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#STR16">STR16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#STR32">STR32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#STR8">STR8</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#TRUE">TRUE</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#UINT16">UINT16</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#UINT32">UINT32</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#UINT64">UINT64</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static byte</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#UINT8">UINT8</a></span></code>&nbsp;</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.io.AbstractWriter">
-<!--   -->
-</a>
-<h3>Fields inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#prettyPrint">prettyPrint</a></code></li>
-</ul>
-</li>
-</ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#MsgpackWriter--">MsgpackWriter</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#write-boolean-">write</a></span>(boolean&nbsp;arg)</code>
-<div class="block">Write the value.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#write-byte:A-">write</a></span>(byte[]&nbsp;arg)</code>
-<div class="block">Write the value.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#write-double-">write</a></span>(double&nbsp;arg)</code>
-<div class="block">Write the value.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#write-long-">write</a></span>(long&nbsp;arg)</code>
-<div class="block">Write the value.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeKey-java.lang.CharSequence-">writeKey</a></span>(java.lang.CharSequence&nbsp;arg)</code>
-<div class="block">Write string key of a map entry.</div>
-</td>
-</tr>
-<tr id="i5" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a></span>()</code>
-<div class="block">Separate the key from the value in a map.</div>
-</td>
-</tr>
-<tr id="i6" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeListEnd--">writeListEnd</a></span>()</code>
-<div class="block">End the current list.</div>
-</td>
-</tr>
-<tr id="i7" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeListStart--">writeListStart</a></span>()</code>
-<div class="block">Start a new list.</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeListStart-int-">writeListStart</a></span>(int&nbsp;len)</code>
-<div class="block">A negative size implies dynamic and will be written when the list is closed.</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeMapEnd--">writeMapEnd</a></span>()</code>
-<div class="block">End the current map.</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeMapStart--">writeMapStart</a></span>()</code>
-<div class="block">Start a new map.</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeMapStart-int-">writeMapStart</a></span>(int&nbsp;len)</code>
-<div class="block">A negative size implies dynamic and will be written when the map is closed.</div>
-</td>
-</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeNewLineIndent--">writeNewLineIndent</a></span>()</code>
-<div class="block">Override point for subclasses which perform use pretty printing, such as json.</div>
-</td>
-</tr>
-<tr id="i13" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeNull--">writeNull</a></span>()</code>
-<div class="block">Write a null value.</div>
-</td>
-</tr>
-<tr id="i14" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeSeparator--">writeSeparator</a></span>()</code>
-<div class="block">Write a value separator, such as the comma in json.</div>
-</td>
-</tr>
-<tr id="i15" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeTo-java.nio.ByteBuffer-">writeTo</a></span>(java.nio.ByteBuffer&nbsp;out)</code>
-<div class="block">Writes the internal buffer to the parameter.</div>
-</td>
-</tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeTo-java.io.OutputStream-">writeTo</a></span>(java.io.OutputStream&nbsp;out)</code>
-<div class="block">Writes the internal buffer to the parameter.</div>
-</td>
-</tr>
-<tr id="i17" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></span>(java.lang.CharSequence&nbsp;arg)</code>
-<div class="block">Write the value, which will never be null.</div>
-</td>
-</tr>
-</table>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.io.AbstractWriter">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginList--">beginList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#beginMap--">beginMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endList--">endList</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#endMap--">endMap</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--">getDepth</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#key-java.lang.CharSequence-">key</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#reset--">reset</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-boolean-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-byte:A-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-double-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-org.iot.dsa.node.DSElement-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-int-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-long-">value</a>, <a href="../../../../../org/iot/dsa/io/AbstractWriter.html#value-java.lang.String-">value</a></code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
-</ul>
-<ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.io.DSIWriter">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a></h3>
-<code><a href="../../../../../org/iot/dsa/io/DSIWriter.html#close--">close</a>, <a href="../../../../../org/iot/dsa/io/DSIWriter.html#flush--">flush</a></code></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ FIELD DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="field.detail">
-<!--   -->
-</a>
-<h3>Field Detail</h3>
-<a name="FIXMAP_PREFIX">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FIXMAP_PREFIX</h4>
-<pre>public static final&nbsp;byte FIXMAP_PREFIX</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.FIXMAP_PREFIX">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FIXLIST_PREFIX">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FIXLIST_PREFIX</h4>
-<pre>public static final&nbsp;byte FIXLIST_PREFIX</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.FIXLIST_PREFIX">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FIXSTR_PREFIX">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FIXSTR_PREFIX</h4>
-<pre>public static final&nbsp;byte FIXSTR_PREFIX</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.FIXSTR_PREFIX">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="NULL">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>NULL</h4>
-<pre>public static final&nbsp;byte NULL</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.NULL">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FALSE">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FALSE</h4>
-<pre>public static final&nbsp;byte FALSE</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.FALSE">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="TRUE">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>TRUE</h4>
-<pre>public static final&nbsp;byte TRUE</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.TRUE">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="BIN8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>BIN8</h4>
-<pre>public static final&nbsp;byte BIN8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.BIN8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="BIN16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>BIN16</h4>
-<pre>public static final&nbsp;byte BIN16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.BIN16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="BIN32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>BIN32</h4>
-<pre>public static final&nbsp;byte BIN32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.BIN32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FLOAT32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FLOAT32</h4>
-<pre>public static final&nbsp;byte FLOAT32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.FLOAT32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="FLOAT64">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>FLOAT64</h4>
-<pre>public static final&nbsp;byte FLOAT64</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.FLOAT64">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT8</h4>
-<pre>public static final&nbsp;byte UINT8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.UINT8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT16</h4>
-<pre>public static final&nbsp;byte UINT16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.UINT16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT32</h4>
-<pre>public static final&nbsp;byte UINT32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.UINT32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="UINT64">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>UINT64</h4>
-<pre>public static final&nbsp;byte UINT64</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.UINT64">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT8</h4>
-<pre>public static final&nbsp;byte INT8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.INT8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT16</h4>
-<pre>public static final&nbsp;byte INT16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.INT16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT32</h4>
-<pre>public static final&nbsp;byte INT32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.INT32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="INT64">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>INT64</h4>
-<pre>public static final&nbsp;byte INT64</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.INT64">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="STR8">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>STR8</h4>
-<pre>public static final&nbsp;byte STR8</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.STR8">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="STR16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>STR16</h4>
-<pre>public static final&nbsp;byte STR16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.STR16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="STR32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>STR32</h4>
-<pre>public static final&nbsp;byte STR32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.STR32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="LIST16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>LIST16</h4>
-<pre>public static final&nbsp;byte LIST16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.LIST16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="LIST32">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>LIST32</h4>
-<pre>public static final&nbsp;byte LIST32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.LIST32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MAP16">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>MAP16</h4>
-<pre>public static final&nbsp;byte MAP16</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.MAP16">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="MAP32">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MAP32</h4>
-<pre>public static final&nbsp;byte MAP32</pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../constant-values.html#org.iot.dsa.io.msgpack.MsgpackWriter.MAP32">Constant Field Values</a></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="MsgpackWriter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>MsgpackWriter</h4>
-<pre>public&nbsp;MsgpackWriter()</pre>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="writeSeparator--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeSeparator</h4>
-<pre>protected&nbsp;void&nbsp;writeSeparator()
-                       throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeSeparator--">AbstractWriter</a></code></span></div>
-<div class="block">Write a value separator, such as the comma in json.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeSeparator--">writeSeparator</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeNewLineIndent--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeNewLineIndent</h4>
-<pre>public&nbsp;void&nbsp;writeNewLineIndent()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeNewLineIndent--">AbstractWriter</a></code></span></div>
-<div class="block">Override point for subclasses which perform use pretty printing, such as json. Does nothing
- by default.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeNewLineIndent--">writeNewLineIndent</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#getDepth--"><code>AbstractWriter.getDepth()</code></a></dd>
-</dl>
-</li>
-</ul>
-<a name="write-boolean-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(boolean&nbsp;arg)
-              throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-boolean-">AbstractWriter</a></code></span></div>
-<div class="block">Write the value.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-boolean-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="write-byte:A-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(byte[]&nbsp;arg)
-              throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-byte:A-">AbstractWriter</a></code></span></div>
-<div class="block">Write the value.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-byte:A-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="write-double-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(double&nbsp;arg)
-              throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-double-">AbstractWriter</a></code></span></div>
-<div class="block">Write the value.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-double-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="write-long-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>write</h4>
-<pre>protected&nbsp;void&nbsp;write(long&nbsp;arg)
-              throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-long-">AbstractWriter</a></code></span></div>
-<div class="block">Write the value.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#write-long-">write</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeKey-java.lang.CharSequence-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeKey</h4>
-<pre>protected&nbsp;void&nbsp;writeKey(java.lang.CharSequence&nbsp;arg)
-                 throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeKey-java.lang.CharSequence-">AbstractWriter</a></code></span></div>
-<div class="block">Write string key of a map entry.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeKey-java.lang.CharSequence-">writeKey</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeKeyValueSeparator--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeKeyValueSeparator</h4>
-<pre>protected&nbsp;void&nbsp;writeKeyValueSeparator()
-                               throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeKeyValueSeparator--">AbstractWriter</a></code></span></div>
-<div class="block">Separate the key from the value in a map.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeKeyValueSeparator--">writeKeyValueSeparator</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeListEnd--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeListEnd</h4>
-<pre>protected&nbsp;void&nbsp;writeListEnd()
-                     throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListEnd--">AbstractWriter</a></code></span></div>
-<div class="block">End the current list.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListEnd--">writeListEnd</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeListStart--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeListStart</h4>
-<pre>protected&nbsp;void&nbsp;writeListStart()
-                       throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart--">AbstractWriter</a></code></span></div>
-<div class="block">Start a new list.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeListStart--">writeListStart</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeListStart-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeListStart</h4>
-<pre>protected&nbsp;void&nbsp;writeListStart(int&nbsp;len)
-                       throws java.io.IOException</pre>
-<div class="block">A negative size implies dynamic and will be written when the list is closed.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeMapEnd--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeMapEnd</h4>
-<pre>protected&nbsp;void&nbsp;writeMapEnd()
-                    throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapEnd--">AbstractWriter</a></code></span></div>
-<div class="block">End the current map.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapEnd--">writeMapEnd</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeMapStart--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeMapStart</h4>
-<pre>protected&nbsp;void&nbsp;writeMapStart()
-                      throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart--">AbstractWriter</a></code></span></div>
-<div class="block">Start a new map.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeMapStart--">writeMapStart</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeMapStart-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeMapStart</h4>
-<pre>protected&nbsp;void&nbsp;writeMapStart(int&nbsp;len)
-                      throws java.io.IOException</pre>
-<div class="block">A negative size implies dynamic and will be written when the map is closed.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeNull--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeNull</h4>
-<pre>protected&nbsp;void&nbsp;writeNull()
-                  throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeNull--">AbstractWriter</a></code></span></div>
-<div class="block">Write a null value.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeNull--">writeNull</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-<a name="writeTo-java.nio.ByteBuffer-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeTo</h4>
-<pre>protected&nbsp;void&nbsp;writeTo(java.nio.ByteBuffer&nbsp;out)</pre>
-<div class="block">Writes the internal buffer to the parameter.  The internal buffer will be cleared.</div>
-</li>
-</ul>
-<a name="writeTo-java.io.OutputStream-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>writeTo</h4>
-<pre>protected&nbsp;void&nbsp;writeTo(java.io.OutputStream&nbsp;out)</pre>
-<div class="block">Writes the internal buffer to the parameter.  The internal buffer will be cleared.</div>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util">DSException</a></code> - if there is an IOException.</dd>
-</dl>
-</li>
-</ul>
-<a name="writeValue-java.lang.CharSequence-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>writeValue</h4>
-<pre>protected&nbsp;void&nbsp;writeValue(java.lang.CharSequence&nbsp;arg)
-                   throws java.io.IOException</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeValue-java.lang.CharSequence-">AbstractWriter</a></code></span></div>
-<div class="block">Write the value, which will never be null.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html#writeValue-java.lang.CharSequence-">writeValue</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io">AbstractWriter</a></code></dd>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<dd><code>java.io.IOException</code></dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../../index-all.html">Index</a></li>
-<li><a href="../../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/MsgpackWriter.html" target="_top">Frames</a></li>
-<li><a href="MsgpackWriter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li>Nested&nbsp;|&nbsp;</li>
-<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/io/msgpack/package-frame.html b/docs/javadoc/org/iot/dsa/io/msgpack/package-frame.html
deleted file mode 100644
index b58edafb..00000000
--- a/docs/javadoc/org/iot/dsa/io/msgpack/package-frame.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io.msgpack (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../../script.js"></script>
-</head>
-<body>
-<h1 class="bar"><a href="../../../../../org/iot/dsa/io/msgpack/package-summary.html" target="classFrame">org.iot.dsa.io.msgpack</a></h1>
-<div class="indexContainer">
-<h2 title="Classes">Classes</h2>
-<ul title="Classes">
-<li><a href="MsgpackReader.html" title="class in org.iot.dsa.io.msgpack" target="classFrame">MsgpackReader</a></li>
-<li><a href="MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack" target="classFrame">MsgpackWriter</a></li>
-</ul>
-</div>
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/io/package-frame.html b/docs/javadoc/org/iot/dsa/io/package-frame.html
index b356d5c7..c7160f06 100644
--- a/docs/javadoc/org/iot/dsa/io/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/io/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.io (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -21,8 +21,6 @@ <h2 title="Classes">Classes</h2>
 <li><a href="AbstractReader.html" title="class in org.iot.dsa.io" target="classFrame">AbstractReader</a></li>
 <li><a href="AbstractWriter.html" title="class in org.iot.dsa.io" target="classFrame">AbstractWriter</a></li>
 <li><a href="DSBase64.html" title="class in org.iot.dsa.io" target="classFrame">DSBase64</a></li>
-<li><a href="DSByteBuffer.html" title="class in org.iot.dsa.io" target="classFrame">DSByteBuffer</a></li>
-<li><a href="DSCharBuffer.html" title="class in org.iot.dsa.io" target="classFrame">DSCharBuffer</a></li>
 <li><a href="NodeDecoder.html" title="class in org.iot.dsa.io" target="classFrame">NodeDecoder</a></li>
 <li><a href="NodeEncoder.html" title="class in org.iot.dsa.io" target="classFrame">NodeEncoder</a></li>
 </ul>
@@ -30,10 +28,6 @@ <h2 title="Enums">Enums</h2>
 <ul title="Enums">
 <li><a href="DSIReader.Token.html" title="enum in org.iot.dsa.io" target="classFrame">DSIReader.Token</a></li>
 </ul>
-<h2 title="Exceptions">Exceptions</h2>
-<ul title="Exceptions">
-<li><a href="DSIoException.html" title="class in org.iot.dsa.io" target="classFrame">DSIoException</a></li>
-</ul>
 </div>
 </body>
 </html>
diff --git a/docs/javadoc/org/iot/dsa/io/package-summary.html b/docs/javadoc/org/iot/dsa/io/package-summary.html
index 7481e425..62d6bd8b 100644
--- a/docs/javadoc/org/iot/dsa/io/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/io/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.io (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.io (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.io (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -70,6 +70,10 @@
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
 <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io</h1>
+<div class="docSummary">
+<div class="block">Node serialization and streaming abstraction for JSON and MsgPack.</div>
+</div>
+<p>See:&nbsp;<a href="#package.description">Description</a></p>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
@@ -124,18 +128,6 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io</h1>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io">DSByteBuffer</a></td>
-<td class="colLast">
-<div class="block">A buffer for storing bytes being pushed from an input stream.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io">DSCharBuffer</a></td>
-<td class="colLast">
-<div class="block">A buffer for storing chars being pushed from a reader.</div>
-</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/io/NodeDecoder.html" title="class in org.iot.dsa.io">NodeDecoder</a></td>
 <td class="colLast">
 <div class="block">Decodes a node (tree) that was encoded with NodeEncoder.</div>
@@ -167,24 +159,12 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io</h1>
 </tbody>
 </table>
 </li>
-<li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Exception Summary table, listing exceptions, and an explanation">
-<caption><span>Exception Summary</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Exception</th>
-<th class="colLast" scope="col">Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">DSIoException</a></td>
-<td class="colLast">
-<div class="block">Unchecked IOException.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
 </ul>
+<a name="package.description">
+<!--   -->
+</a>
+<h2 title="Package org.iot.dsa.io Description">Package org.iot.dsa.io Description</h2>
+<div class="block">Node serialization and streaming abstraction for JSON and MsgPack.</div>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
diff --git a/docs/javadoc/org/iot/dsa/io/package-tree.html b/docs/javadoc/org/iot/dsa/io/package-tree.html
index c40fd59e..3778d043 100644
--- a/docs/javadoc/org/iot/dsa/io/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/io/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.io Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.io Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.io Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -83,23 +83,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io"><span class="typeNameLink">AbstractReader</span></a> (implements org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a>)</li>
 <li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io"><span class="typeNameLink">AbstractWriter</span></a> (implements java.io.Closeable, org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a>)</li>
 <li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSBase64</span></a></li>
-<li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSByteBuffer</span></a></li>
-<li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSCharBuffer</span></a></li>
 <li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/NodeDecoder.html" title="class in org.iot.dsa.io"><span class="typeNameLink">NodeDecoder</span></a></li>
 <li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/NodeEncoder.html" title="class in org.iot.dsa.io"><span class="typeNameLink">NodeEncoder</span></a></li>
-<li type="circle">java.lang.Throwable (implements java.io.Serializable)
-<ul>
-<li type="circle">java.lang.Exception
-<ul>
-<li type="circle">java.lang.RuntimeException
-<ul>
-<li type="circle">org.iot.dsa.io.<a href="../../../../org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSIoException</span></a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/logging/AsyncLogHandler.html b/docs/javadoc/org/iot/dsa/logging/AsyncLogHandler.html
index 4a7ae1c3..7e526a3b 100644
--- a/docs/javadoc/org/iot/dsa/logging/AsyncLogHandler.html
+++ b/docs/javadoc/org/iot/dsa/logging/AsyncLogHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>AsyncLogHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>AsyncLogHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="AsyncLogHandler (dslink-core 0.11.0 API)";
+            parent.document.title="AsyncLogHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":6,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":6,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/logging/AsyncLogHandler.html" target="_top">Frames</a></li>
@@ -112,13 +112,18 @@ <h2 title="Class AsyncLogHandler" class="title">Class AsyncLogHandler</h2>
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dd>
+</dl>
+<dl>
 <dt>Direct Known Subclasses:</dt>
 <dd><a href="../../../../org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a>, <a href="../../../../org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging">PrintStreamLogHandler</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public abstract class <span class="typeNameLabel">AsyncLogHandler</span>
-extends java.util.logging.Handler</pre>
+extends java.util.logging.Handler
+implements <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></pre>
 <div class="block">Enqueues logging records which are then processed by separate thread.</div>
 </li>
 </ul>
@@ -126,6 +131,21 @@ <h2 title="Class AsyncLogHandler" class="title">Class AsyncLogHandler</h2>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -156,72 +176,62 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#backlog--">backlog</a></span>()</code>
-<div class="block">The number of items on the queue.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#close--">close</a></span>()</code>
 <div class="block">Closes the PrintStream, terminates the write thread and performs houseKeeping.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#flush--">flush</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getHouseKeepingIntervalMillis--">getHouseKeepingIntervalMillis</a></span>()</code>
 <div class="block">Ten seconds by default, this is a guideline more than anything else.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getMaxQueueSize--">getMaxQueueSize</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>protected java.io.PrintStream</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getOut--">getOut</a></span>()</code>
 <div class="block">The sink for formatted messages.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>protected abstract java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getThreadName--">getThreadName</a></span>()</code>
 <div class="block">Used to name the thread that processes logging records.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#houseKeeping--">houseKeeping</a></span>()</code>
 <div class="block">Subclass hook for activities such as rolling files and cleaning up old garbage.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#publish-java.util.logging.LogRecord-">publish</a></span>(java.util.logging.LogRecord&nbsp;record)</code>
 <div class="block">Enqueues the record for the write thread.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setMaxQueueSize-int-">setMaxQueueSize</a></span>(int&nbsp;maxQueueSize)</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setOut-java.io.PrintStream-">setOut</a></span>(java.io.PrintStream&nbsp;out)</code>
 <div class="block">Sets the sink for formatted messages.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#start--">start</a></span>()</code>
 <div class="block">This must be called for the handler to actually do anything.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#write-java.util.logging.LogRecord-">write</a></span>(java.util.logging.LogRecord&nbsp;record)</code>
 <div class="block">Formats and writes the logging record the underlying stream.</div>
@@ -273,16 +283,6 @@ <h4>AsyncLogHandler</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="backlog--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>backlog</h4>
-<pre>public&nbsp;int&nbsp;backlog()</pre>
-<div class="block">The number of items on the queue.</div>
-</li>
-</ul>
 <a name="close--">
 <!--   -->
 </a>
@@ -321,15 +321,6 @@ <h4>getHouseKeepingIntervalMillis</h4>
  called sooner during low activity periods.</div>
 </li>
 </ul>
-<a name="getMaxQueueSize--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getMaxQueueSize</h4>
-<pre>public&nbsp;int&nbsp;getMaxQueueSize()</pre>
-</li>
-</ul>
 <a name="getOut--">
 <!--   -->
 </a>
@@ -444,7 +435,7 @@ <h4>write</h4>
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/logging/AsyncLogHandler.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/logging/DSILevels.html b/docs/javadoc/org/iot/dsa/logging/DSILevels.html
new file mode 100644
index 00000000..5d278784
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/logging/DSILevels.html
@@ -0,0 +1,487 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSILevels (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSILevels (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/logging/DSILevels.html" target="_top">Frames</a></li>
+<li><a href="DSILevels.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.logging</div>
+<h2 title="Interface DSILevels" class="title">Interface DSILevels</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a>, <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>, <a href="../../../../org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink">DSLinkConfig</a>, <a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a>, <a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>, <a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a>, <a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a>, <a href="../../../../org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a>, <a href="../../../../org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging">PrintStreamLogHandler</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">DSILevels</span></pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.util.logging.Level</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="TRACE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>TRACE</h4>
+<pre>static final&nbsp;int TRACE</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.TRACE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="DEBUG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DEBUG</h4>
+<pre>static final&nbsp;int DEBUG</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.DEBUG">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="FINE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>FINE</h4>
+<pre>static final&nbsp;int FINE</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.FINE">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="CONFIG">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CONFIG</h4>
+<pre>static final&nbsp;int CONFIG</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.CONFIG">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="WARN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>WARN</h4>
+<pre>static final&nbsp;int WARN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.WARN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="INFO">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INFO</h4>
+<pre>static final&nbsp;int INFO</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.INFO">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="ERROR">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ERROR</h4>
+<pre>static final&nbsp;int ERROR</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.ERROR">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="ADMIN">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ADMIN</h4>
+<pre>static final&nbsp;int ADMIN</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.ADMIN">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="FATAL">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>FATAL</h4>
+<pre>static final&nbsp;int FATAL</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.logging.DSILevels.FATAL">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="all">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>all</h4>
+<pre>static final&nbsp;java.util.logging.Level all</pre>
+</li>
+</ul>
+<a name="trace">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>trace</h4>
+<pre>static final&nbsp;java.util.logging.Level trace</pre>
+</li>
+</ul>
+<a name="debug">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>debug</h4>
+<pre>static final&nbsp;java.util.logging.Level debug</pre>
+</li>
+</ul>
+<a name="fine">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fine</h4>
+<pre>static final&nbsp;java.util.logging.Level fine</pre>
+</li>
+</ul>
+<a name="warn">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>warn</h4>
+<pre>static final&nbsp;java.util.logging.Level warn</pre>
+</li>
+</ul>
+<a name="info">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>info</h4>
+<pre>static final&nbsp;java.util.logging.Level info</pre>
+</li>
+</ul>
+<a name="error">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>error</h4>
+<pre>static final&nbsp;java.util.logging.Level error</pre>
+</li>
+</ul>
+<a name="admin">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>admin</h4>
+<pre>static final&nbsp;java.util.logging.Level admin</pre>
+</li>
+</ul>
+<a name="fatal">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fatal</h4>
+<pre>static final&nbsp;java.util.logging.Level fatal</pre>
+</li>
+</ul>
+<a name="off">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>off</h4>
+<pre>static final&nbsp;java.util.logging.Level off</pre>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/logging/DSILevels.html" target="_top">Frames</a></li>
+<li><a href="DSILevels.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/logging/DSLogger.html b/docs/javadoc/org/iot/dsa/logging/DSLogger.html
index 31b03bbb..1abdf36b 100644
--- a/docs/javadoc/org/iot/dsa/logging/DSLogger.html
+++ b/docs/javadoc/org/iot/dsa/logging/DSLogger.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSLogger (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLogger (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLogger (dslink-core 0.11.0 API)";
+            parent.document.title="DSLogger (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -107,14 +107,29 @@ <h2 title="Class DSLogger" class="title">Class DSLogger</h2>
 <ul class="blockList">
 <li class="blockList">
 <dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dd>
+</dl>
+<dl>
 <dt>Direct Known Subclasses:</dt>
 <dd><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSLogger</span>
-extends java.lang.Object</pre>
-<div class="block">Adds a convenience layer to Java Util Logging.
+extends java.lang.Object
+implements <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></pre>
+<div class="block">Adds an abstraction layer on Java Util Logging for two purposes:
+
+ <ul>
+
+ <li>To use the DSA levels.
+
+ <li>So JUL can be replaced with other logging frameworks if desired.
+
+ </ul>
+
+ This has methods that enables conditional logging (most efficient) using ternary statements.
 
  <p>
 
@@ -123,9 +138,8 @@ <h2 title="Class DSLogger" class="title">Class DSLogger</h2>
  <pre>
 
  <code>
- if (myLogger.isLoggable(Level.FINE) {
-   myLogger.fine(someMessage());
- }
+ if (myLogger.isLoggable(Level.INFO))
+     myLogger.info(someMessage());
  </code>
 
  </pre>
@@ -135,30 +149,33 @@ <h2 title="Class DSLogger" class="title">Class DSLogger</h2>
  <pre>
 
  <code>
- fine(fine() ? someMessage() : null);
+ info(info() ? someMessage() : null);
  </code>
 
  </pre>
 
  <p>
 
- Level Guidelines:
+ DSA defines levels differently than JUL, however, all JUL levels will be mapped / formatted
+ for DSA.  Level guidelines:
 
  <ul>
 
- <li>finest = verbose or trace
+ <li>trace() = DSA trace  = JUL finest
+
+ <li>debug() = DSA debug  = JUL finer
 
- <li>finer  = debug
+ <li>fine()  = DSA info   = JUL fine, config
 
- <li>fine   = common or frequent event
+ <li>warn()  = DSA warn   = Custom level
 
- <li>config = configuration info
+ <li>info()  = DSA sys    = JUL info
 
- <li>info   = major lifecycle event
+ <li>error() = DSA error  = JUL warning
 
- <li>warn   = unusual and infrequent, but not critical
+ <li>admin() = DSA admin  = Custom level
 
- <li>severe = critical / fatal error or event
+ <li>fatal() = DSA fatal  = JUL severe
 
  </ul></div>
 </li>
@@ -167,6 +184,21 @@ <h2 title="Class DSLogger" class="title">Class DSLogger</h2>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -198,124 +230,144 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#config--">config</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#config-java.lang.Object-">config</a></span>(java.lang.Object&nbsp;msg)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a></span>(java.lang.Object&nbsp;msg)</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a></span>(java.lang.Object&nbsp;msg,
+     java.lang.Throwable&nbsp;x)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a></span>(java.lang.Object&nbsp;msg)</code>
-<div class="block">Log a frequent event.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a></span>(java.lang.Object&nbsp;msg)</code>
+<div class="block">Log a debug event.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a></span>(java.lang.Object&nbsp;msg,
-    java.lang.Throwable&nbsp;x)</code>
-<div class="block">Log a frequent event.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a></span>(java.lang.Object&nbsp;msg,
+     java.lang.Throwable&nbsp;x)</code>
+<div class="block">Log a debug event.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#finer--">finer</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-">finer</a></span>(java.lang.Object&nbsp;msg)</code>
-<div class="block">Log a debug event.</div>
-</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a></span>(java.lang.Object&nbsp;msg)</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-java.lang.Throwable-">finer</a></span>(java.lang.Object&nbsp;msg,
-     java.lang.Throwable&nbsp;x)</code>
-<div class="block">Log a debug event.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a></span>(java.lang.Object&nbsp;msg,
+     java.lang.Throwable&nbsp;x)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a></span>()</code>
+<div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a></span>(java.lang.Object&nbsp;msg)</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a></span>(java.lang.Object&nbsp;msg,
+     java.lang.Throwable&nbsp;x)</code>&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#finest--">finest</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-">finest</a></span>(java.lang.Object&nbsp;msg)</code>
-<div class="block">Log a trace or verbose event.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a></span>(java.lang.Object&nbsp;msg)</code>
+<div class="block">Log a frequent event.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-java.lang.Throwable-">finest</a></span>(java.lang.Object&nbsp;msg,
-      java.lang.Throwable&nbsp;x)</code>
-<div class="block">Log a trace or verbose event.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a></span>(java.lang.Object&nbsp;msg,
+    java.lang.Throwable&nbsp;x)</code>
+<div class="block">Log a frequent event.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>java.util.logging.Logger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogger--">getLogger</a></span>()</code>
-<div class="block">Override point, returns the console logger by default.</div>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">getLogName</a></span>()</code>
+<div class="block">Override point, returns the simple class name by default.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a></span>(java.lang.Object&nbsp;msg)</code>
 <div class="block">Log an infrequent major lifecycle event.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a></span>(java.lang.Object&nbsp;msg,
     java.lang.Throwable&nbsp;x)</code>
 <div class="block">Log an infrequent major lifecycle event.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#severe--">severe</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-">severe</a></span>(java.lang.Object&nbsp;msg)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a></span>(java.lang.Object&nbsp;msg)</code>
+<div class="block">Log a trace or verbose event.</div>
+</td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-java.lang.Throwable-">severe</a></span>(java.lang.Object&nbsp;msg,
-      java.lang.Throwable&nbsp;x)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a></span>(java.lang.Object&nbsp;msg,
+     java.lang.Throwable&nbsp;x)</code>
+<div class="block">Log a trace or verbose event.</div>
+</td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a></span>()</code>
 <div class="block">True if the level is loggable.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a></span>(java.lang.Object&nbsp;msg)</code>
 <div class="block">Log an unusual but not critical event.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></span>(java.lang.Object&nbsp;msg,
     java.lang.Throwable&nbsp;x)</code>
@@ -361,126 +413,138 @@ <h4>DSLogger</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="config--">
+<a name="getLogName--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>config</h4>
-<pre>public&nbsp;boolean&nbsp;config()</pre>
+<h4>getLogName</h4>
+<pre>protected&nbsp;java.lang.String&nbsp;getLogName()</pre>
+<div class="block">Override point, returns the simple class name by default.</div>
+</li>
+</ul>
+<a name="trace--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>trace</h4>
+<pre>public&nbsp;boolean&nbsp;trace()</pre>
 <div class="block">True if the level is loggable.</div>
 </li>
 </ul>
-<a name="config-java.lang.Object-">
+<a name="trace-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>config</h4>
-<pre>public&nbsp;void&nbsp;config(java.lang.Object&nbsp;msg)</pre>
+<h4>trace</h4>
+<pre>public&nbsp;void&nbsp;trace(java.lang.Object&nbsp;msg)</pre>
+<div class="block">Log a trace or verbose event.</div>
 </li>
 </ul>
-<a name="getLogger--">
+<a name="trace-java.lang.Object-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getLogger</h4>
-<pre>public&nbsp;java.util.logging.Logger&nbsp;getLogger()</pre>
-<div class="block">Override point, returns the console logger by default.</div>
+<h4>trace</h4>
+<pre>public&nbsp;void&nbsp;trace(java.lang.Object&nbsp;msg,
+                  java.lang.Throwable&nbsp;x)</pre>
+<div class="block">Log a trace or verbose event.</div>
 </li>
 </ul>
-<a name="fine--">
+<a name="debug--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>fine</h4>
-<pre>public&nbsp;boolean&nbsp;fine()</pre>
+<h4>debug</h4>
+<pre>public&nbsp;boolean&nbsp;debug()</pre>
 <div class="block">True if the level is loggable.</div>
 </li>
 </ul>
-<a name="fine-java.lang.Object-">
+<a name="debug-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>fine</h4>
-<pre>public&nbsp;void&nbsp;fine(java.lang.Object&nbsp;msg)</pre>
-<div class="block">Log a frequent event.</div>
+<h4>debug</h4>
+<pre>public&nbsp;void&nbsp;debug(java.lang.Object&nbsp;msg)</pre>
+<div class="block">Log a debug event.</div>
 </li>
 </ul>
-<a name="fine-java.lang.Object-java.lang.Throwable-">
+<a name="debug-java.lang.Object-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>fine</h4>
-<pre>public&nbsp;void&nbsp;fine(java.lang.Object&nbsp;msg,
-                 java.lang.Throwable&nbsp;x)</pre>
-<div class="block">Log a frequent event.</div>
+<h4>debug</h4>
+<pre>public&nbsp;void&nbsp;debug(java.lang.Object&nbsp;msg,
+                  java.lang.Throwable&nbsp;x)</pre>
+<div class="block">Log a debug event.</div>
 </li>
 </ul>
-<a name="finer--">
+<a name="fine--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>finer</h4>
-<pre>public&nbsp;boolean&nbsp;finer()</pre>
+<h4>fine</h4>
+<pre>public&nbsp;boolean&nbsp;fine()</pre>
 <div class="block">True if the level is loggable.</div>
 </li>
 </ul>
-<a name="finer-java.lang.Object-">
+<a name="fine-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>finer</h4>
-<pre>public&nbsp;void&nbsp;finer(java.lang.Object&nbsp;msg)</pre>
-<div class="block">Log a debug event.</div>
+<h4>fine</h4>
+<pre>public&nbsp;void&nbsp;fine(java.lang.Object&nbsp;msg)</pre>
+<div class="block">Log a frequent event.</div>
 </li>
 </ul>
-<a name="finer-java.lang.Object-java.lang.Throwable-">
+<a name="fine-java.lang.Object-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>finer</h4>
-<pre>public&nbsp;void&nbsp;finer(java.lang.Object&nbsp;msg,
-                  java.lang.Throwable&nbsp;x)</pre>
-<div class="block">Log a debug event.</div>
+<h4>fine</h4>
+<pre>public&nbsp;void&nbsp;fine(java.lang.Object&nbsp;msg,
+                 java.lang.Throwable&nbsp;x)</pre>
+<div class="block">Log a frequent event.</div>
 </li>
 </ul>
-<a name="finest--">
+<a name="warn--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>finest</h4>
-<pre>public&nbsp;boolean&nbsp;finest()</pre>
+<h4>warn</h4>
+<pre>public&nbsp;boolean&nbsp;warn()</pre>
 <div class="block">True if the level is loggable.</div>
 </li>
 </ul>
-<a name="finest-java.lang.Object-">
+<a name="warn-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>finest</h4>
-<pre>public&nbsp;void&nbsp;finest(java.lang.Object&nbsp;msg)</pre>
-<div class="block">Log a trace or verbose event.</div>
+<h4>warn</h4>
+<pre>public&nbsp;void&nbsp;warn(java.lang.Object&nbsp;msg)</pre>
+<div class="block">Log an unusual but not critical event.</div>
 </li>
 </ul>
-<a name="finest-java.lang.Object-java.lang.Throwable-">
+<a name="warn-java.lang.Object-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>finest</h4>
-<pre>public&nbsp;void&nbsp;finest(java.lang.Object&nbsp;msg,
-                   java.lang.Throwable&nbsp;x)</pre>
-<div class="block">Log a trace or verbose event.</div>
+<h4>warn</h4>
+<pre>public&nbsp;void&nbsp;warn(java.lang.Object&nbsp;msg,
+                 java.lang.Throwable&nbsp;x)</pre>
+<div class="block">Log an unusual but not critical event.</div>
 </li>
 </ul>
 <a name="info--">
@@ -514,64 +578,91 @@ <h4>info</h4>
 <div class="block">Log an infrequent major lifecycle event.</div>
 </li>
 </ul>
-<a name="severe--">
+<a name="error--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>severe</h4>
-<pre>public&nbsp;boolean&nbsp;severe()</pre>
+<h4>error</h4>
+<pre>public&nbsp;boolean&nbsp;error()</pre>
 <div class="block">True if the level is loggable.</div>
 </li>
 </ul>
-<a name="severe-java.lang.Object-">
+<a name="error-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>severe</h4>
-<pre>public&nbsp;void&nbsp;severe(java.lang.Object&nbsp;msg)</pre>
+<h4>error</h4>
+<pre>public&nbsp;void&nbsp;error(java.lang.Object&nbsp;msg)</pre>
 </li>
 </ul>
-<a name="severe-java.lang.Object-java.lang.Throwable-">
+<a name="error-java.lang.Object-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>severe</h4>
-<pre>public&nbsp;void&nbsp;severe(java.lang.Object&nbsp;msg,
-                   java.lang.Throwable&nbsp;x)</pre>
+<h4>error</h4>
+<pre>public&nbsp;void&nbsp;error(java.lang.Object&nbsp;msg,
+                  java.lang.Throwable&nbsp;x)</pre>
 </li>
 </ul>
-<a name="warn--">
+<a name="admin--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>warn</h4>
-<pre>public&nbsp;boolean&nbsp;warn()</pre>
+<h4>admin</h4>
+<pre>public&nbsp;boolean&nbsp;admin()</pre>
 <div class="block">True if the level is loggable.</div>
 </li>
 </ul>
-<a name="warn-java.lang.Object-">
+<a name="admin-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>warn</h4>
-<pre>public&nbsp;void&nbsp;warn(java.lang.Object&nbsp;msg)</pre>
-<div class="block">Log an unusual but not critical event.</div>
+<h4>admin</h4>
+<pre>public&nbsp;void&nbsp;admin(java.lang.Object&nbsp;msg)</pre>
 </li>
 </ul>
-<a name="warn-java.lang.Object-java.lang.Throwable-">
+<a name="admin-java.lang.Object-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>admin</h4>
+<pre>public&nbsp;void&nbsp;admin(java.lang.Object&nbsp;msg,
+                  java.lang.Throwable&nbsp;x)</pre>
+</li>
+</ul>
+<a name="fatal--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fatal</h4>
+<pre>public&nbsp;boolean&nbsp;fatal()</pre>
+<div class="block">True if the level is loggable.</div>
+</li>
+</ul>
+<a name="fatal-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fatal</h4>
+<pre>public&nbsp;void&nbsp;fatal(java.lang.Object&nbsp;msg)</pre>
+</li>
+</ul>
+<a name="fatal-java.lang.Object-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>warn</h4>
-<pre>public&nbsp;void&nbsp;warn(java.lang.Object&nbsp;msg,
-                 java.lang.Throwable&nbsp;x)</pre>
-<div class="block">Log an unusual but not critical event.</div>
+<h4>fatal</h4>
+<pre>public&nbsp;void&nbsp;fatal(java.lang.Object&nbsp;msg,
+                  java.lang.Throwable&nbsp;x)</pre>
 </li>
 </ul>
 </li>
@@ -601,7 +692,7 @@ <h4>warn</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/logging/DSLogging.html b/docs/javadoc/org/iot/dsa/logging/DSLogging.html
index e18d7fac..a65e5b34 100644
--- a/docs/javadoc/org/iot/dsa/logging/DSLogging.html
+++ b/docs/javadoc/org/iot/dsa/logging/DSLogging.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSLogging (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLogging (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLogging (dslink-core 0.11.0 API)";
+            parent.document.title="DSLogging (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -163,19 +163,25 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogging.html#close--">close</a></span>()</code>
+<div class="block">Closes all async log handlers.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>static java.util.logging.Logger</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogging.html#getDefaultLogger--">getDefaultLogger</a></span>()</code>
 <div class="block">The default logger.</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>static java.util.logging.Logger</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogging.html#getLogger-java.lang.String-java.io.File-">getLogger</a></span>(java.lang.String&nbsp;name,
          java.io.File&nbsp;logFile)</code>
 <div class="block">Adds a FileLogHandler to the named logger, if there isn't one already.</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/DSLogging.html#setDefaultLevel-java.util.logging.Level-">setDefaultLevel</a></span>(java.util.logging.Level&nbsp;level)</code>&nbsp;</td>
 </tr>
@@ -239,6 +245,16 @@ <h4>DEFAULT_MAX_QUEUE</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="close--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>close</h4>
+<pre>public static&nbsp;void&nbsp;close()</pre>
+<div class="block">Closes all async log handlers.</div>
+</li>
+</ul>
 <a name="getDefaultLogger--">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/logging/FileLogHandler.html b/docs/javadoc/org/iot/dsa/logging/FileLogHandler.html
index 3291b689..c2d40b6a 100644
--- a/docs/javadoc/org/iot/dsa/logging/FileLogHandler.html
+++ b/docs/javadoc/org/iot/dsa/logging/FileLogHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>FileLogHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>FileLogHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="FileLogHandler (dslink-core 0.11.0 API)";
+            parent.document.title="FileLogHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -116,6 +116,10 @@ <h2 title="Class FileLogHandler" class="title">Class FileLogHandler</h2>
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">FileLogHandler</span>
@@ -128,6 +132,21 @@ <h2 title="Class FileLogHandler" class="title">Class FileLogHandler</h2>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ========== METHOD SUMMARY =========== -->
 <ul class="blockList">
 <li class="blockList"><a name="method.summary">
@@ -147,54 +166,48 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#getBackupThreshold--">getBackupThreshold</a></span>()</code>
-<div class="block">The size after which a logging file will be backed up and cleared.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#getHandler-java.io.File-">getHandler</a></span>(java.io.File&nbsp;file)</code>
 <div class="block">Will return an existing handler for the given file, or create a new one.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#getMaxBackups--">getMaxBackups</a></span>()</code>
 <div class="block">The number of backup files to retain.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#getThreadName--">getThreadName</a></span>()</code>
 <div class="block">Used to name the thread that processes logging records.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#houseKeeping--">houseKeeping</a></span>()</code>
 <div class="block">Subclass hook for activities such as rolling files and cleaning up old garbage.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#makeBackup--">makeBackup</a></span>()</code>
 <div class="block">Only public for testing, do not call.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#setBackupThreshold-int-">setBackupThreshold</a></span>(int&nbsp;arg)</code>
 <div class="block">The file size threshold after which a logging file will be backed up and cleared.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging">FileLogHandler</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#setMaxBackups-int-">setMaxBackups</a></span>(int&nbsp;arg)</code>
 <div class="block">The default is 10.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/logging/FileLogHandler.html#trimBackups--">trimBackups</a></span>()</code>
 <div class="block">Only public for testing, do not call.</div>
@@ -206,7 +219,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></h3>
-<code><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#backlog--">backlog</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#close--">close</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#flush--">flush</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getHouseKeepingIntervalMillis--">getHouseKeepingIntervalMillis</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getMaxQueueSize--">getMaxQueueSize</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getOut--">getOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#publish-java.util.logging.LogRecord-">publish</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setMaxQueueSize-int-">setMaxQueueSize</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setOut-java.io.PrintStream-">setOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#start--">start</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#write-java.util.logging.LogRecord-">write</a></code></li>
+<code><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#close--">close</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#flush--">flush</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getHouseKeepingIntervalMillis--">getHouseKeepingIntervalMillis</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getOut--">getOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#publish-java.util.logging.LogRecord-">publish</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setMaxQueueSize-int-">setMaxQueueSize</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setOut-java.io.PrintStream-">setOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#start--">start</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#write-java.util.logging.LogRecord-">write</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.util.logging.Handler">
@@ -256,16 +269,6 @@ <h4>getBackups</h4>
 <div class="block">Backup files for this logging, found in the same directory as the active logging.</div>
 </li>
 </ul>
-<a name="getBackupThreshold--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getBackupThreshold</h4>
-<pre>public&nbsp;int&nbsp;getBackupThreshold()</pre>
-<div class="block">The size after which a logging file will be backed up and cleared.</div>
-</li>
-</ul>
 <a name="getMaxBackups--">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/logging/PrintStreamLogHandler.html b/docs/javadoc/org/iot/dsa/logging/PrintStreamLogHandler.html
index 8bddb12d..56b9b5d6 100644
--- a/docs/javadoc/org/iot/dsa/logging/PrintStreamLogHandler.html
+++ b/docs/javadoc/org/iot/dsa/logging/PrintStreamLogHandler.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>PrintStreamLogHandler (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>PrintStreamLogHandler (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="PrintStreamLogHandler (dslink-core 0.11.0 API)";
+            parent.document.title="PrintStreamLogHandler (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -116,6 +116,10 @@ <h2 title="Class PrintStreamLogHandler" class="title">Class PrintStreamLogHandle
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">PrintStreamLogHandler</span>
@@ -127,6 +131,21 @@ <h2 title="Class PrintStreamLogHandler" class="title">Class PrintStreamLogHandle
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -169,7 +188,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging">AsyncLogHandler</a></h3>
-<code><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#backlog--">backlog</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#close--">close</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#flush--">flush</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getHouseKeepingIntervalMillis--">getHouseKeepingIntervalMillis</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getMaxQueueSize--">getMaxQueueSize</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getOut--">getOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#houseKeeping--">houseKeeping</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#publish-java.util.logging.LogRecord-">publish</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setMaxQueueSize-int-">setMaxQueueSize</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setOut-java.io.PrintStream-">setOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#start--">start</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#write-java.util.logging.LogRecord-">write</a></code></li>
+<code><a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#close--">close</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#flush--">flush</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getHouseKeepingIntervalMillis--">getHouseKeepingIntervalMillis</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#getOut--">getOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#houseKeeping--">houseKeeping</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#publish-java.util.logging.LogRecord-">publish</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setMaxQueueSize-int-">setMaxQueueSize</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#setOut-java.io.PrintStream-">setOut</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#start--">start</a>, <a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html#write-java.util.logging.LogRecord-">write</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.util.logging.Handler">
diff --git a/docs/javadoc/org/iot/dsa/logging/package-frame.html b/docs/javadoc/org/iot/dsa/logging/package-frame.html
index fffa09e6..b6c07d9d 100644
--- a/docs/javadoc/org/iot/dsa/logging/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/logging/package-frame.html
@@ -2,15 +2,19 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.logging (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.logging (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <h1 class="bar"><a href="../../../../org/iot/dsa/logging/package-summary.html" target="classFrame">org.iot.dsa.logging</a></h1>
 <div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="DSILevels.html" title="interface in org.iot.dsa.logging" target="classFrame"><span class="interfaceName">DSILevels</span></a></li>
+</ul>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="AsyncLogHandler.html" title="class in org.iot.dsa.logging" target="classFrame">AsyncLogHandler</a></li>
diff --git a/docs/javadoc/org/iot/dsa/logging/package-summary.html b/docs/javadoc/org/iot/dsa/logging/package-summary.html
index 593914a5..1a487d61 100644
--- a/docs/javadoc/org/iot/dsa/logging/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/logging/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.logging (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.logging (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.logging (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.logging (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/msgpack/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/iot/dsa/io/json/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/iot/dsa/node/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
@@ -78,6 +78,21 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.logging</h1>
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
 <table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
@@ -94,7 +109,11 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.logging</h1>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></td>
 <td class="colLast">
-<div class="block">Adds a convenience layer to Java Util Logging.</div>
+<div class="block">Adds an abstraction layer on Java Util Logging for two purposes:
+
+ 
+
+ To use the DSA levels.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -145,7 +164,7 @@ <h2 title="Package org.iot.dsa.logging Description">Package org.iot.dsa.logging
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/msgpack/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/iot/dsa/io/json/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/iot/dsa/node/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/logging/package-tree.html b/docs/javadoc/org/iot/dsa/logging/package-tree.html
index 10a20f2e..7be07aaf 100644
--- a/docs/javadoc/org/iot/dsa/logging/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/logging/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.logging Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.logging Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.logging Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.logging Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/msgpack/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/iot/dsa/io/json/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/iot/dsa/node/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
@@ -80,11 +80,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a></li>
+<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a> (implements org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)</li>
 <li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogging.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogging</span></a></li>
 <li type="circle">java.util.logging.Handler
 <ul>
-<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">AsyncLogHandler</span></a>
+<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">AsyncLogHandler</span></a> (implements org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)
 <ul>
 <li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">FileLogHandler</span></a></li>
 <li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">PrintStreamLogHandler</span></a></li>
@@ -95,6 +95,10 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </ul>
 </li>
 </ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">DSILevels</span></a></li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
@@ -116,7 +120,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/io/msgpack/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/iot/dsa/io/json/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/iot/dsa/node/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/node/DSBool.html b/docs/javadoc/org/iot/dsa/node/DSBool.html
index 8d0f97f5..1ee14393 100644
--- a/docs/javadoc/org/iot/dsa/node/DSBool.html
+++ b/docs/javadoc/org/iot/dsa/node/DSBool.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSBool (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSBool (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSBool (dslink-core 0.11.0 API)";
+            parent.document.title="DSBool (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -266,13 +266,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSBytes.html b/docs/javadoc/org/iot/dsa/node/DSBytes.html
index 96089fe2..67fd42d4 100644
--- a/docs/javadoc/org/iot/dsa/node/DSBytes.html
+++ b/docs/javadoc/org/iot/dsa/node/DSBytes.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSBytes (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSBytes (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSBytes (dslink-core 0.11.0 API)";
+            parent.document.title="DSBytes (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":10,"i22":10,"i23":9,"i24":10,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9};
+var methods = {"i0":9,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":9,"i10":10,"i11":10,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":10,"i23":9,"i24":9,"i25":10,"i26":9,"i27":10,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9,"i37":9,"i38":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -177,52 +177,58 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#fromHex-java.lang.CharSequence-">fromHex</a></span>(java.lang.CharSequence&nbsp;s)</code>
+<div class="block">Converts a hex string into a byte array.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>byte[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#getBytes--">getBytes</a></span>()</code>
 <div class="block">The raw bytes, do not modify.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElementType.html" title="enum in org.iot.dsa.node">DSElementType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#getElementType--">getElementType</a></span>()</code>
 <div class="block">For switch statements.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#getValueType--">getValueType</a></span>()</code>
 <div class="block">The DSA value type mapping.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#isBytes--">isBytes</a></span>()</code>
 <div class="block">Whether or not the object represents a byte array.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#isBytes-java.lang.String-">isBytes</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">True if the string starts with the DSA escape sequence for a base 64 encoded string.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#isNull--">isNull</a></span>()</code>
 <div class="block">Whether or not the object represents null.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#length--">length</a></span>()</code>
 <div class="block">The number of bytes in the array.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static double</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readDouble-byte:A-int-boolean-">readDouble</a></span>(byte[]&nbsp;buf,
           int&nbsp;off,
@@ -230,14 +236,14 @@ <h3>Method Summary</h3>
 <div class="block">Reads the primitive from a byte array.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>static double</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readDouble-java.io.InputStream-boolean-">readDouble</a></span>(java.io.InputStream&nbsp;in,
           boolean&nbsp;bigEndian)</code>
 <div class="block">Reads the primitive from a stream.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>static float</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readFloat-byte:A-int-boolean-">readFloat</a></span>(byte[]&nbsp;buf,
          int&nbsp;off,
@@ -245,14 +251,14 @@ <h3>Method Summary</h3>
 <div class="block">Reads the primitive from a byte array.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>static float</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readFloat-java.io.InputStream-boolean-">readFloat</a></span>(java.io.InputStream&nbsp;in,
          boolean&nbsp;bigEndian)</code>
 <div class="block">Reads the primitive a stream</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readInt-byte:A-int-boolean-">readInt</a></span>(byte[]&nbsp;buf,
        int&nbsp;off,
@@ -260,14 +266,14 @@ <h3>Method Summary</h3>
 <div class="block">Reads the primitive from a byte array.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readInt-java.io.InputStream-boolean-">readInt</a></span>(java.io.InputStream&nbsp;in,
        boolean&nbsp;bigEndian)</code>
 <div class="block">Reads the primitive from a stream.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>static long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readLong-byte:A-int-boolean-">readLong</a></span>(byte[]&nbsp;buf,
         int&nbsp;off,
@@ -275,14 +281,14 @@ <h3>Method Summary</h3>
 <div class="block">Reads the primitive from a byte array.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>static long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readLong-java.io.InputStream-boolean-">readLong</a></span>(java.io.InputStream&nbsp;in,
         boolean&nbsp;bigEndian)</code>
 <div class="block">Reads the primitive from a stream.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>static short</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readShort-byte:A-int-boolean-">readShort</a></span>(byte[]&nbsp;buf,
          int&nbsp;off,
@@ -290,42 +296,56 @@ <h3>Method Summary</h3>
 <div class="block">Reads the primitive from a byte array.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static short</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#readShort-java.io.InputStream-boolean-">readShort</a></span>(java.io.InputStream&nbsp;in,
          boolean&nbsp;bigEndian)</code>
 <div class="block">Reads the primitive from a stream.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>byte[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#toBytes--">toBytes</a></span>()</code>
 <div class="block">Returns the raw byte array for DSBytes only, which should not be modified.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i23" class="rowColor">
+<td class="colFirst"><code>static java.lang.StringBuilder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#toHex-byte:A-java.lang.StringBuilder-">toHex</a></span>(byte[]&nbsp;bytes,
+     java.lang.StringBuilder&nbsp;buf)</code>
+<div class="block">Converts the bytes into a hex string.</div>
+</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>static java.lang.StringBuilder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#toHex-byte-java.lang.StringBuilder-">toHex</a></span>(byte&nbsp;val,
+     java.lang.StringBuilder&nbsp;buf)</code>
+<div class="block">Converts the bytes into a hex string.</div>
+</td>
+</tr>
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#toString--">toString</a></span>()</code>
 <div class="block">If isNull(), returns "null", otherwise returns toElement().toString()</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#valueOf-byte:A-">valueOf</a></span>(byte[]&nbsp;arg)</code>&nbsp;</td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">Returns the argument.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Decodes a base64 encoded byte array.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeDouble-double-byte:A-int-boolean-">writeDouble</a></span>(double&nbsp;v,
            byte[]&nbsp;buf,
@@ -334,7 +354,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a byte array.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeDouble-double-java.io.OutputStream-boolean-">writeDouble</a></span>(double&nbsp;v,
            java.io.OutputStream&nbsp;out,
@@ -342,7 +362,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a stream.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeFloat-float-byte:A-int-boolean-">writeFloat</a></span>(float&nbsp;v,
           byte[]&nbsp;buf,
@@ -351,7 +371,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a byte array.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeFloat-float-java.io.OutputStream-boolean-">writeFloat</a></span>(float&nbsp;v,
           java.io.OutputStream&nbsp;out,
@@ -359,7 +379,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a stream</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeInt-int-byte:A-int-boolean-">writeInt</a></span>(int&nbsp;v,
         byte[]&nbsp;buf,
@@ -368,7 +388,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a byte array.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeInt-int-java.io.OutputStream-boolean-">writeInt</a></span>(int&nbsp;v,
         java.io.OutputStream&nbsp;out,
@@ -376,7 +396,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a stream.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeLong-long-byte:A-int-boolean-">writeLong</a></span>(long&nbsp;v,
          byte[]&nbsp;buf,
@@ -385,7 +405,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a byte array.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeLong-long-java.io.OutputStream-boolean-">writeLong</a></span>(long&nbsp;v,
          java.io.OutputStream&nbsp;out,
@@ -393,7 +413,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a stream.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeShort-short-byte:A-int-boolean-">writeShort</a></span>(short&nbsp;v,
           byte[]&nbsp;buf,
@@ -402,7 +422,7 @@ <h3>Method Summary</h3>
 <div class="block">Encodes the primitive into a byte array.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSBytes.html#writeShort-short-java.io.OutputStream-boolean-">writeShort</a></span>(short&nbsp;v,
           java.io.OutputStream&nbsp;out,
@@ -419,13 +439,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBoolean--">toBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toDouble--">toDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toFloat--">toFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toInt--">toInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toLong--">toLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -495,6 +508,16 @@ <h4>equals</h4>
 </dl>
 </li>
 </ul>
+<a name="fromHex-java.lang.CharSequence-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fromHex</h4>
+<pre>public static&nbsp;byte[]&nbsp;fromHex(java.lang.CharSequence&nbsp;s)</pre>
+<div class="block">Converts a hex string into a byte array.</div>
+</li>
+</ul>
 <a name="getBytes--">
 <!--   -->
 </a>
@@ -789,6 +812,42 @@ <h4>toBytes</h4>
 </dl>
 </li>
 </ul>
+<a name="toHex-byte-java.lang.StringBuilder-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toHex</h4>
+<pre>public static&nbsp;java.lang.StringBuilder&nbsp;toHex(byte&nbsp;val,
+                                            java.lang.StringBuilder&nbsp;buf)</pre>
+<div class="block">Converts the bytes into a hex string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>val</code> - What to convert.</dd>
+<dd><code>buf</code> - Where to put the results, can be null.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The buf parameter, or a new StringBuilder if the param was null.</dd>
+</dl>
+</li>
+</ul>
+<a name="toHex-byte:A-java.lang.StringBuilder-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toHex</h4>
+<pre>public static&nbsp;java.lang.StringBuilder&nbsp;toHex(byte[]&nbsp;bytes,
+                                            java.lang.StringBuilder&nbsp;buf)</pre>
+<div class="block">Converts the bytes into a hex string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>bytes</code> - What to convert.</dd>
+<dd><code>buf</code> - Where to put the results, can be null.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The buf parameter, or a new StringBuilder if the param was null.</dd>
+</dl>
+</li>
+</ul>
 <a name="toString--">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSDouble.html b/docs/javadoc/org/iot/dsa/node/DSDouble.html
index b04c40b6..7dd41a41 100644
--- a/docs/javadoc/org/iot/dsa/node/DSDouble.html
+++ b/docs/javadoc/org/iot/dsa/node/DSDouble.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSDouble (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSDouble (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSDouble (dslink-core 0.11.0 API)";
+            parent.document.title="DSDouble (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -280,13 +280,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSElement.html b/docs/javadoc/org/iot/dsa/node/DSElement.html
index 0b8657cc..b2595822 100644
--- a/docs/javadoc/org/iot/dsa/node/DSElement.html
+++ b/docs/javadoc/org/iot/dsa/node/DSElement.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSElement (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSElement (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSElement (dslink-core 0.11.0 API)";
+            parent.document.title="DSElement (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -123,7 +123,7 @@ <h2 title="Class DSElement" class="title">Class DSElement</h2>
 <br>
 <pre>public abstract class <span class="typeNameLabel">DSElement</span>
 extends <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></pre>
-<div class="block">The primitives of the node model.  These map JSON types without additional meta-data.</div>
+<div class="block">The primitives of the node model.  These map to JSON types without additional meta-data.</div>
 </li>
 </ul>
 </div>
@@ -371,7 +371,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#toString--">toString</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSValue.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/docs/javadoc/org/iot/dsa/node/DSElementType.html b/docs/javadoc/org/iot/dsa/node/DSElementType.html
index a6ddbba1..3d6733a0 100644
--- a/docs/javadoc/org/iot/dsa/node/DSElementType.html
+++ b/docs/javadoc/org/iot/dsa/node/DSElementType.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSElementType (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSElementType (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSElementType (dslink-core 0.11.0 API)";
+            parent.document.title="DSElementType (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSFlexEnum.html b/docs/javadoc/org/iot/dsa/node/DSFlexEnum.html
index 446ecabc..999dd3c2 100644
--- a/docs/javadoc/org/iot/dsa/node/DSFlexEnum.html
+++ b/docs/javadoc/org/iot/dsa/node/DSFlexEnum.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSFlexEnum (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSFlexEnum (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSFlexEnum (dslink-core 0.11.0 API)";
+            parent.document.title="DSFlexEnum (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -113,13 +113,13 @@ <h2 title="Class DSFlexEnum" class="title">Class DSFlexEnum</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSFlexEnum</span>
 extends <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>
-implements <a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a></pre>
+implements <a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></pre>
 <div class="block">An enum where the value and range can be created at runtime, primarily intended for defining
  action parameters.</div>
 </li>
@@ -209,13 +209,14 @@ <h3>Method Summary</h3>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSFlexEnum.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSFlexEnum.html#store--">store</a></span>()</code>
-<div class="block">Calls toElement()</div>
+<div class="block">Serialize the value for the configuration database.</div>
 </td>
 </tr>
 <tr id="i10" class="altColor">
@@ -427,13 +428,12 @@ <h4>isNull</h4>
 <li class="blockList">
 <h4>restore</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">DSValue</a></code></span></div>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">DSIStorable</a></code></span></div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -444,13 +444,12 @@ <h4>restore</h4>
 <li class="blockList">
 <h4>store</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;store()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#store--">DSValue</a></code></span></div>
-<div class="block">Calls toElement()</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">DSIStorable</a></code></span></div>
+<div class="block">Serialize the value for the configuration database.  Can be a different element type than
+ toElement().</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/node/DSFloat.html b/docs/javadoc/org/iot/dsa/node/DSFloat.html
index 62e983f2..c4f31f8f 100644
--- a/docs/javadoc/org/iot/dsa/node/DSFloat.html
+++ b/docs/javadoc/org/iot/dsa/node/DSFloat.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSFloat (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSFloat (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSFloat (dslink-core 0.11.0 API)";
+            parent.document.title="DSFloat (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -280,7 +280,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/docs/javadoc/org/iot/dsa/node/DSGroup.html b/docs/javadoc/org/iot/dsa/node/DSGroup.html
index 5bf3d845..5dbcfdaf 100644
--- a/docs/javadoc/org/iot/dsa/node/DSGroup.html
+++ b/docs/javadoc/org/iot/dsa/node/DSGroup.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSGroup (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSGroup (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSGroup (dslink-core 0.11.0 API)";
+            parent.document.title="DSGroup (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":10,"i2":10,"i3":6,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":6,"i25":10,"i26":10,"i27":6,"i28":10,"i29":10};
+var methods = {"i0":6,"i1":10,"i2":10,"i3":6,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":6,"i26":10,"i27":10,"i28":6,"i29":10,"i30":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -274,72 +274,76 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i18" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#hasParent--">hasParent</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#indexOf-org.iot.dsa.node.DSElement-">indexOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;obj)</code>
 <div class="block">Scans the collection and returns the first index that equal the arg.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#isEmpty--">isEmpty</a></span>()</code>
 <div class="block">Returns true when childCount() == 0.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#isGroup--">isGroup</a></span>()</code>
 <div class="block">Whether or not the object represents a list or map.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#isNull-int-">isNull</a></span>(int&nbsp;idx)</code>
 <div class="block">Whether or not the object at the given index is null.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#last--">last</a></span>()</code>
 <div class="block">Returns the item at the highest index.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#lastIndexOf-org.iot.dsa.node.DSElement-">lastIndexOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;obj)</code>
 <div class="block">Scans the collection and returns the first index that equal the arg.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>abstract <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#remove-int-">remove</a></span>(int&nbsp;idx)</code>
 <div class="block">Removes the value at the given index and returns it.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#removeFirst--">removeFirst</a></span>()</code>
 <div class="block">Remove and return the item at index 0.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#removeLast--">removeLast</a></span>()</code>
 <div class="block">Remove and return the item at the highest index.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>abstract int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#size--">size</a></span>()</code>
 <div class="block">The number of items is the group.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#toGroup--">toGroup</a></span>()</code>
 <div class="block">Lists and maps return themselves, everything else results in an exception.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSGroup.html#toString--">toString</a></span>()</code>
 <div class="block">Json encodes the graph, be careful.</div>
@@ -354,13 +358,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#getElementType--">getElementType</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#getValueType--">getValueType</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBoolean--">toBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toDouble--">toDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toFloat--">toFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toInt--">toInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toLong--">toLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -438,6 +435,15 @@ <h4>hashCode</h4>
 </dl>
 </li>
 </ul>
+<a name="hasParent--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hasParent</h4>
+<pre>public&nbsp;boolean&nbsp;hasParent()</pre>
+</li>
+</ul>
 <a name="first--">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSIBoolean.html b/docs/javadoc/org/iot/dsa/node/DSIBoolean.html
index 087ce3d1..94f1dee0 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIBoolean.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIBoolean.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIBoolean (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIBoolean (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIBoolean (dslink-core 0.11.0 API)";
+            parent.document.title="DSIBoolean (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSIEnum.html b/docs/javadoc/org/iot/dsa/node/DSIEnum.html
index 876b4648..d2138dbe 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIEnum.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIEnum.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIEnum (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIEnum (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIEnum (dslink-core 0.11.0 API)";
+            parent.document.title="DSIEnum (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSIMetadata.html b/docs/javadoc/org/iot/dsa/node/DSIMetadata.html
index e9dd870e..761c0dd8 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIMetadata.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIMetadata.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIMetadata (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIMetadata (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIMetadata (dslink-core 0.11.0 API)";
+            parent.document.title="DSIMetadata (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSINumber.html b/docs/javadoc/org/iot/dsa/node/DSINumber.html
index 02153c4f..19bcff2f 100644
--- a/docs/javadoc/org/iot/dsa/node/DSINumber.html
+++ b/docs/javadoc/org/iot/dsa/node/DSINumber.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSINumber (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSINumber (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSINumber (dslink-core 0.11.0 API)";
+            parent.document.title="DSINumber (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSIObject.html b/docs/javadoc/org/iot/dsa/node/DSIObject.html
index f23c6379..6027ca11 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIObject.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIObject.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIObject (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIObject (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIObject (dslink-core 0.11.0 API)";
+            parent.document.title="DSIObject (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/node/DSIObject.html" target="_top">Frames</a></li>
@@ -104,7 +104,7 @@ <h2 title="Interface DSIObject" class="title">Interface DSIObject</h2>
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a>, <a href="../../../../org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a>, <a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a>, <a href="../../../../org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a>, <a href="../../../../org/iot/dsa/node/DSDouble.html" title="class in org.iot.dsa.node">DSDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>, <a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a>, <a href="../../../../org/iot/dsa/node/DSFloat.html" title="class in org.iot.dsa.node">DSFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a>, <a href="../../../../org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node">DSInt</a>, <a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a>, <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>, <a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>, <a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>, <a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a>, <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>, <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>, <a href="../../../../org/iot/dsa/node/DSNull.html" title="class in org.iot.dsa.node">DSNull</a>, <a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a>, <a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a>, <a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a>, <a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a>, <a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a>, <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a>, <a href="../../../../org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a>, <a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a>, <a href="../../../../org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a>, <a href="../../../../org/iot/dsa/node/DSDouble.html" title="class in org.iot.dsa.node">DSDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>, <a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a>, <a href="../../../../org/iot/dsa/node/DSFloat.html" title="class in org.iot.dsa.node">DSFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a>, <a href="../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a>, <a href="../../../../org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node">DSInt</a>, <a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a>, <a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>, <a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>, <a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>, <a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a>, <a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a>, <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>, <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>, <a href="../../../../org/iot/dsa/node/DSNull.html" title="class in org.iot.dsa.node">DSNull</a>, <a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a>, <a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a>, <a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a>, <a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a>, <a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a>, <a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>, <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>, <a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a>, <a href="../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></dd>
 </dl>
 <hr>
 <br>
@@ -218,7 +218,7 @@ <h4>isNull</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/node/DSIObject.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/DSIPublisher.html b/docs/javadoc/org/iot/dsa/node/DSIPublisher.html
deleted file mode 100644
index 699960d2..00000000
--- a/docs/javadoc/org/iot/dsa/node/DSIPublisher.html
+++ /dev/null
@@ -1,278 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIPublisher (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIPublisher (dslink-core 0.11.0 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-var methods = {"i0":6,"i1":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
-var altColor = "altColor";
-var rowColor = "rowColor";
-var tableTab = "tableTab";
-var activeTableTab = "activeTableTab";
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/node/DSIPublisher.html" target="_top">Frames</a></li>
-<li><a href="DSIPublisher.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="subTitle">org.iot.dsa.node</div>
-<h2 title="Interface DSIPublisher" class="title">Interface DSIPublisher</h2>
-</div>
-<div class="contentContainer">
-<div class="description">
-<ul class="blockList">
-<li class="blockList">
-<hr>
-<br>
-<pre>public interface <span class="typeNameLabel">DSIPublisher</span></pre>
-<div class="block">DSEvent producer.
-
- <p>
-
- Nodes do not notify parent containers of any events.  However, if a node subtype implements this
- interface, parent containers will treat all events emitted as a child changed event.
-
- <p>
-
- Mutable DSIValues such as DSFlexEnum should implement this interface. However, DSList and DSMap
- do not.
-
- <p>
-
- Containers will not publish events if they are stopped.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><code>DSISubscriber</code></a></dd>
-</dl>
-</li>
-</ul>
-</div>
-<div class="summary">
-<ul class="blockList">
-<li class="blockList">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
-<!--   -->
-</a>
-<h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
-<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Interface and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a></span></code>
-<div class="block">Passed to DSISubscriber onEvent to describe the event.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-<!-- ========== METHOD SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.summary">
-<!--   -->
-</a>
-<h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe</a></span>(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;subscriber)</code>
-<div class="block">Subscribes the argument, has no effect if the argument is already subscribed.</div>
-</td>
-</tr>
-<tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIPublisher.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe</a></span>(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;subscriber)</code>
-<div class="block">Unsubscribes the argument, has no effect if the argument is not currently subscribed.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="details">
-<ul class="blockList">
-<li class="blockList">
-<!-- ============ METHOD DETAIL ========== -->
-<ul class="blockList">
-<li class="blockList"><a name="method.detail">
-<!--   -->
-</a>
-<h3>Method Detail</h3>
-<a name="subscribe-org.iot.dsa.node.DSISubscriber-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>subscribe</h4>
-<pre>void&nbsp;subscribe(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;subscriber)</pre>
-<div class="block">Subscribes the argument, has no effect if the argument is already subscribed.</div>
-</li>
-</ul>
-<a name="unsubscribe-org.iot.dsa.node.DSISubscriber-">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>unsubscribe</h4>
-<pre>void&nbsp;unsubscribe(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;subscriber)</pre>
-<div class="block">Unsubscribes the argument, has no effect if the argument is not currently subscribed.</div>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-<!-- ========= END OF CLASS DATA ========= -->
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../../../overview-summary.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="navBarCell1Rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../../index-all.html">Index</a></li>
-<li><a href="../../../../help-doc.html">Help</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
-</ul>
-<ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/node/DSIPublisher.html" target="_top">Frames</a></li>
-<li><a href="DSIPublisher.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<div>
-<ul class="subNavList">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.summary">Method</a></li>
-</ul>
-<ul class="subNavList">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method.detail">Method</a></li>
-</ul>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-</body>
-</html>
diff --git a/docs/javadoc/org/iot/dsa/node/DSIStatus.html b/docs/javadoc/org/iot/dsa/node/DSIStatus.html
index abc20815..637a21f6 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIStatus.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIStatus.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIStatus (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIStatus (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIStatus (dslink-core 0.11.0 API)";
+            parent.document.title="DSIStatus (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -48,8 +48,8 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/node/DSIStatus.html" target="_top">Frames</a></li>
@@ -179,8 +179,8 @@ <h4>toStatus</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/node/DSIStatus.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/DSISubscriber.html b/docs/javadoc/org/iot/dsa/node/DSIStorable.html
similarity index 66%
rename from docs/javadoc/org/iot/dsa/node/DSISubscriber.html
rename to docs/javadoc/org/iot/dsa/node/DSIStorable.html
index 6d14660d..98fed2db 100644
--- a/docs/javadoc/org/iot/dsa/node/DSISubscriber.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIStorable.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSISubscriber (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIStorable (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSISubscriber (dslink-core 0.11.0 API)";
+            parent.document.title="DSIStorable (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6};
+var methods = {"i0":6,"i1":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -52,8 +52,8 @@
 <li><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/node/DSISubscriber.html" target="_top">Frames</a></li>
-<li><a href="DSISubscriber.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/iot/dsa/node/DSIStorable.html" target="_top">Frames</a></li>
+<li><a href="DSIStorable.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -92,7 +92,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.iot.dsa.node</div>
-<h2 title="Interface DSISubscriber" class="title">Interface DSISubscriber</h2>
+<h2 title="Interface DSIStorable" class="title">Interface DSIStorable</h2>
 </div>
 <div class="contentContainer">
 <div class="description">
@@ -100,16 +100,13 @@ <h2 title="Interface DSISubscriber" class="title">Interface DSISubscriber</h2>
 <li class="blockList">
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a>, <a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a>, <a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a>, <a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a>, <a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></dd>
 </dl>
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">DSISubscriber</span></pre>
-<div class="block">Interface for receiving events from DSIPublishers.</div>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><code>DSIPublisher</code></a></dd>
-</dl>
+<pre>public interface <span class="typeNameLabel">DSIStorable</span></pre>
+<div class="block">Enables custom serialization for non-node values in the configuration database.  Not used
+ for DSA interop.</div>
 </li>
 </ul>
 </div>
@@ -129,10 +126,17 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSISubscriber.html#onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">onEvent</a></span>(<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;publisher,
-       <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
-       <a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&nbsp;event)</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</code>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">store</a></span>()</code>
+<div class="block">Serialize the value for the configuration database.</div>
+</td>
 </tr>
 </table>
 </li>
@@ -149,21 +153,26 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">
+<a name="restore-org.iot.dsa.node.DSElement-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>restore</h4>
+<pre><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</pre>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
+</li>
+</ul>
+<a name="store--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>onEvent</h4>
-<pre>void&nbsp;onEvent(<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;publisher,
-             <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
-             <a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&nbsp;event)</pre>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>publisher</code> - The object that was subscribed to, will never be null.</dd>
-<dd><code>child</code> - If the event does not involve a child, this will be null.</dd>
-<dd><code>event</code> - Describes the event, will never be null.</dd>
-</dl>
+<h4>store</h4>
+<pre><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;store()</pre>
+<div class="block">Serialize the value for the configuration database.  Can be a different element type than
+ toElement().</div>
 </li>
 </ul>
 </li>
@@ -197,8 +206,8 @@ <h4>onEvent</h4>
 <li><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../index.html?org/iot/dsa/node/DSISubscriber.html" target="_top">Frames</a></li>
-<li><a href="DSISubscriber.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../index.html?org/iot/dsa/node/DSIStorable.html" target="_top">Frames</a></li>
+<li><a href="DSIStorable.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/DSIValue.html b/docs/javadoc/org/iot/dsa/node/DSIValue.html
index e53af4b9..df896cbf 100644
--- a/docs/javadoc/org/iot/dsa/node/DSIValue.html
+++ b/docs/javadoc/org/iot/dsa/node/DSIValue.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIValue (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSIValue (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIValue (dslink-core 0.11.0 API)";
+            parent.document.title="DSIValue (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -108,7 +108,7 @@ <h2 title="Interface DSIValue" class="title">Interface DSIValue</h2>
 </dl>
 <dl>
 <dt>All Known Implementing Classes:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a>, <a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a>, <a href="../../../../org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a>, <a href="../../../../org/iot/dsa/node/DSDouble.html" title="class in org.iot.dsa.node">DSDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>, <a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a>, <a href="../../../../org/iot/dsa/node/DSFloat.html" title="class in org.iot.dsa.node">DSFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a>, <a href="../../../../org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node">DSInt</a>, <a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a>, <a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>, <a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a>, <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>, <a href="../../../../org/iot/dsa/node/DSNull.html" title="class in org.iot.dsa.node">DSNull</a>, <a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a>, <a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a>, <a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a>, <a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a>, <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSBool.html" title="class in org.iot.dsa.node">DSBool</a>, <a href="../../../../org/iot/dsa/node/DSBytes.html" title="class in org.iot.dsa.node">DSBytes</a>, <a href="../../../../org/iot/dsa/time/DSDateTime.html" title="class in org.iot.dsa.time">DSDateTime</a>, <a href="../../../../org/iot/dsa/node/DSDouble.html" title="class in org.iot.dsa.node">DSDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>, <a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node">DSFlexEnum</a>, <a href="../../../../org/iot/dsa/node/DSFloat.html" title="class in org.iot.dsa.node">DSFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a>, <a href="../../../../org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node">DSInt</a>, <a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a>, <a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>, <a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a>, <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>, <a href="../../../../org/iot/dsa/node/DSNull.html" title="class in org.iot.dsa.node">DSNull</a>, <a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a>, <a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a>, <a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a>, <a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a>, <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>, <a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dd>
 </dl>
 <hr>
 <br>
@@ -126,16 +126,23 @@ <h2 title="Interface DSIValue" class="title">Interface DSIValue</h2>
 
  <li>Have a NULL instance if possible.
 
- <li>Try to maintain singleton instances when possible.
+ <li>Try to maintain singleton instances when possible, especially for common instances.
 
- <li>Use static valueOf methods to ensure singleton values such as NULL are used.
+ <li>Instead of constructors, use static valueOf methods to ensure singleton values such as NULL
+ are used.
 
  <li>Register an instance for decoding with DSRegistry.registerDecoder(YourValue.class, instance)
  in a static initializer. If you have a NULL instance, use that.
 
  <li>If mutable (avoid if at all possible), implement DSIPublisher so nodes know of changes.
 
+ <li>If a DSNode subclass is implementing DSIValue, it's onSet(DSIValue) must also be overridden.
+
  </ul></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-"><code>DSNode.onSet(DSIValue)</code></a></dd>
+</dl>
 </li>
 </ul>
 </div>
@@ -167,26 +174,13 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</code>
-<div class="block">Deserialize a value from the configuration database, these will be values returned from the
- store() method.</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></span>()</code>
-<div class="block">Serialize the value for the configuration database.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIValue.html#toElement--">toElement</a></span>()</code>
 <div class="block">The current value should convert itself to an element for DSA interop such as subscription
  updates, and setting requests.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSIValue.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</code>
 <div class="block">This should convert an element transmitted over DSA, such as subscription updates or set
@@ -240,28 +234,6 @@ <h4>isNull</h4>
 </dl>
 </li>
 </ul>
-<a name="restore-org.iot.dsa.node.DSElement-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>restore</h4>
-<pre><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</pre>
-<div class="block">Deserialize a value from the configuration database, these will be values returned from the
- store() method.</div>
-</li>
-</ul>
-<a name="store--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>store</h4>
-<pre><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;store()</pre>
-<div class="block">Serialize the value for the configuration database.  Can be a different element type than
- toElement().</div>
-</li>
-</ul>
 <a name="toElement--">
 <!--   -->
 </a>
@@ -311,7 +283,7 @@ <h4>valueOf</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/node/DSInfo.html b/docs/javadoc/org/iot/dsa/node/DSInfo.html
index e4cb7252..87d09a5d 100644
--- a/docs/javadoc/org/iot/dsa/node/DSInfo.html
+++ b/docs/javadoc/org/iot/dsa/node/DSInfo.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSInfo (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSInfo (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSInfo (dslink-core 0.11.0 API)";
+            parent.document.title="DSInfo (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -108,13 +108,13 @@ <h2 title="Class DSInfo" class="title">Class DSInfo</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a>, <a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a></dd>
+<dd><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSInfo</span>
 extends java.lang.Object
-implements <a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a>, <a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a></pre>
+implements <a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></pre>
 <div class="block">All node children have corresponding DSInfo instances. This type serves two purposes:
 
  <p>
@@ -227,9 +227,7 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata</a></span>(<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</code>
-<div class="block">Add any meta-data for the object to the given map.</div>
-</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata</a></span>(<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</code>&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
@@ -281,93 +279,91 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i22" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isConfig--">isConfig</a></span>()</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isAdmin--">isAdmin</a></span>()</code>
 <div class="block">Whether or not this object requires configuration permission to read/write.</div>
 </td>
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isDefaultOnCopy--">isDefaultOnCopy</a></span>()</code>
+<div class="block">Whether or not the current value, or the default value is copied.</div>
+</td>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isDynamic--">isDynamic</a></span>()</code>
 <div class="block">Whether or not this info represents a declared default.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isEqual-org.iot.dsa.node.DSInfo-">isEqual</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;arg)</code>
 <div class="block">True if the flags and target object are equal (not identical if the target is a node).</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isHidden--">isHidden</a></span>()</code>
 <div class="block">Whether or not an object is visible to clients.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isIdentical-org.iot.dsa.node.DSInfo-">isIdentical</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;arg)</code>
 <div class="block">True if the flags and target object are identical.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isNode--">isNode</a></span>()</code>
 <div class="block">Whether or not the object is a DSNode.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isReadOnly--">isReadOnly</a></span>()</code>
 <div class="block">Whether or not an object can be written by a client.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isTransient--">isTransient</a></span>()</code>
 <div class="block">Whether or not an object is persistent.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#isValue--">isValue</a></span>()</code>
 <div class="block">True if getValue() can be called.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#next--">next</a></span>()</code>
 <div class="block">The next info in the parent node.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#nextAction--">nextAction</a></span>()</code>
 <div class="block">The next DSInfo in the parent that is an action, or null.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#nextNode--">nextNode</a></span>()</code>
 <div class="block">The next DSInfo in the parent that is a node, or null.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#nextValue--">nextValue</a></span>()</code>
 <div class="block">The next DSInfo in the parent that is a value, or null.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">onEvent</a></span>(<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;publisher,
-       <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
-       <a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&nbsp;event)</code>
-<div class="block">Routes events from child DSIPublishers to onChildChanged in the parent.</div>
-</td>
-</tr>
 <tr id="i36" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#setConfig-boolean-">setConfig</a></span>(boolean&nbsp;config)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSInfo.html#setAdmin-boolean-">setAdmin</a></span>(boolean&nbsp;admin)</code>&nbsp;</td>
 </tr>
 <tr id="i37" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
@@ -533,33 +529,31 @@ <h4>getElement</h4>
 <div class="block">A convenience that casts getObject().</div>
 </li>
 </ul>
-<a name="getMetadata-org.iot.dsa.node.DSMap-">
+<a name="getName--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getMetadata</h4>
-<pre>public&nbsp;void&nbsp;getMetadata(<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getMetadata-org.iot.dsa.node.DSMap-">ApiObject</a></code></span></div>
-<div class="block">Add any meta-data for the object to the given map.</div>
+<h4>getName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getName--">ApiObject</a></code></span></div>
+<div class="block">The display name.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getName--">getName</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="getName--">
+<a name="getMetadata-org.iot.dsa.node.DSMap-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getName</h4>
-<pre>public&nbsp;java.lang.String&nbsp;getName()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getName--">ApiObject</a></code></span></div>
-<div class="block">The display name.</div>
+<h4>getMetadata</h4>
+<pre>public&nbsp;void&nbsp;getMetadata(<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getName--">getName</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#getMetadata-org.iot.dsa.node.DSMap-">getMetadata</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -620,16 +614,6 @@ <h4>hasChildren</h4>
 </dl>
 </li>
 </ul>
-<a name="hasNext--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>hasNext</h4>
-<pre>public&nbsp;boolean&nbsp;hasNext()</pre>
-<div class="block">True if there is another info after this one.</div>
-</li>
-</ul>
 <a name="hashCode--">
 <!--   -->
 </a>
@@ -643,6 +627,16 @@ <h4>hashCode</h4>
 </dl>
 </li>
 </ul>
+<a name="hasNext--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>hasNext</h4>
+<pre>public&nbsp;boolean&nbsp;hasNext()</pre>
+<div class="block">True if there is another info after this one.</div>
+</li>
+</ul>
 <a name="isAction--">
 <!--   -->
 </a>
@@ -658,21 +652,31 @@ <h4>isAction</h4>
 </dl>
 </li>
 </ul>
-<a name="isConfig--">
+<a name="isAdmin--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>isConfig</h4>
-<pre>public&nbsp;boolean&nbsp;isConfig()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#isConfig--">ApiObject</a></code></span></div>
+<h4>isAdmin</h4>
+<pre>public&nbsp;boolean&nbsp;isAdmin()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#isAdmin--">ApiObject</a></code></span></div>
 <div class="block">Whether or not this object requires configuration permission to read/write.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#isConfig--">isConfig</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html#isAdmin--">isAdmin</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a></code></dd>
 </dl>
 </li>
 </ul>
+<a name="isDefaultOnCopy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isDefaultOnCopy</h4>
+<pre>public&nbsp;boolean&nbsp;isDefaultOnCopy()</pre>
+<div class="block">Whether or not the current value, or the default value is copied.</div>
+</li>
+</ul>
 <a name="isDynamic--">
 <!--   -->
 </a>
@@ -716,8 +720,8 @@ <h4>isHidden</h4>
 <li class="blockList">
 <h4>isIdentical</h4>
 <pre>public&nbsp;boolean&nbsp;isIdentical(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;arg)</pre>
-<div class="block">True if the flags and target object are identical.  Two nodes are identical
- if their children are in the same order.</div>
+<div class="block">True if the flags and target object are identical.  Two nodes are identical if their children
+ are in the same order.</div>
 </li>
 </ul>
 <a name="isNode--">
@@ -809,33 +813,13 @@ <h4>nextValue</h4>
 <div class="block">The next DSInfo in the parent that is a value, or null.</div>
 </li>
 </ul>
-<a name="onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>onEvent</h4>
-<pre>public&nbsp;void&nbsp;onEvent(<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;publisher,
-                    <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
-                    <a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a>&nbsp;event)</pre>
-<div class="block">Routes events from child DSIPublishers to onChildChanged in the parent.</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSISubscriber.html#onEvent-org.iot.dsa.node.DSIObject-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIPublisher.Event-">onEvent</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a></code></dd>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>publisher</code> - The object that was subscribed to, will never be null.</dd>
-<dd><code>child</code> - If the event does not involve a child, this will be null.</dd>
-<dd><code>event</code> - Describes the event, will never be null.</dd>
-</dl>
-</li>
-</ul>
-<a name="setConfig-boolean-">
+<a name="setAdmin-boolean-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setConfig</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;setConfig(boolean&nbsp;config)</pre>
+<h4>setAdmin</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;setAdmin(boolean&nbsp;admin)</pre>
 </li>
 </ul>
 <a name="setHidden-boolean-">
diff --git a/docs/javadoc/org/iot/dsa/node/DSInt.html b/docs/javadoc/org/iot/dsa/node/DSInt.html
index f65c3481..0f87531d 100644
--- a/docs/javadoc/org/iot/dsa/node/DSInt.html
+++ b/docs/javadoc/org/iot/dsa/node/DSInt.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSInt (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSInt (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSInt (dslink-core 0.11.0 API)";
+            parent.document.title="DSInt (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -279,7 +279,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/docs/javadoc/org/iot/dsa/node/DSJavaEnum.html b/docs/javadoc/org/iot/dsa/node/DSJavaEnum.html
index f4ecdd45..d21ea01f 100644
--- a/docs/javadoc/org/iot/dsa/node/DSJavaEnum.html
+++ b/docs/javadoc/org/iot/dsa/node/DSJavaEnum.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSJavaEnum (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSJavaEnum (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSJavaEnum (dslink-core 0.11.0 API)";
+            parent.document.title="DSJavaEnum (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -113,13 +113,13 @@ <h2 title="Class DSJavaEnum" class="title">Class DSJavaEnum</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSJavaEnum</span>
 extends <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>
-implements <a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a></pre>
+implements <a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, <a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></pre>
 <div class="block">Wrapper for Java enums.</div>
 </li>
 </ul>
@@ -202,13 +202,14 @@ <h3>Method Summary</h3>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSJavaEnum.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSJavaEnum.html#store--">store</a></span>()</code>
-<div class="block">Calls toElement()</div>
+<div class="block">Serialize the value for the configuration database.</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
@@ -413,13 +414,12 @@ <h4>isNull</h4>
 <li class="blockList">
 <h4>restore</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node">DSJavaEnum</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">DSValue</a></code></span></div>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">DSIStorable</a></code></span></div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -430,13 +430,12 @@ <h4>restore</h4>
 <li class="blockList">
 <h4>store</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;store()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#store--">DSValue</a></code></span></div>
-<div class="block">Calls toElement()</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">DSIStorable</a></code></span></div>
+<div class="block">Serialize the value for the configuration database.  Can be a different element type than
+ toElement().</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/node/DSList.html b/docs/javadoc/org/iot/dsa/node/DSList.html
index a5bfb373..d2f2fd8a 100644
--- a/docs/javadoc/org/iot/dsa/node/DSList.html
+++ b/docs/javadoc/org/iot/dsa/node/DSList.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSList (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSList (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSList (dslink-core 0.11.0 API)";
+            parent.document.title="DSList (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -401,7 +401,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSGroup.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#first--">first</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-boolean-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-double-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-int-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-long-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getBoolean-int-">getBoolean</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getDouble-int-">getDouble</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getFloat-int-">getFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getInt-int-">getInt</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getList-int-">getList</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getLong-int-">getLong</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getMap-int-">getMap</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getString-int-">getString</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#hashCode--">hashCode</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#indexOf-org.iot.dsa.node.DSElement-">indexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isEmpty--">isEmpty</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isNull-int-">isNull</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#last--">last</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#lastIndexOf-org.iot.dsa.node.DSElement-">lastIndexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeFirst--">removeFirst</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeLast--">removeLast</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toString--">toString</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSGroup.html#equals-java.lang.Object-">equals</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#first--">first</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-boolean-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-double-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-int-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-long-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getBoolean-int-">getBoolean</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getDouble-int-">getDouble</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getFloat-int-">getFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getInt-int-">getInt</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getList-int-">getList</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getLong-int-">getLong</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getMap-int-">getMap</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getString-int-">getString</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#hashCode--">hashCode</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#hasParent--">hasParent</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#indexOf-org.iot.dsa.node.DSElement-">indexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isEmpty--">isEmpty</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isNull-int-">isNull</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#last--">last</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#lastIndexOf-org.iot.dsa.node.DSElement-">lastIndexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeFirst--">removeFirst</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeLast--">removeLast</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSElement">
@@ -411,13 +411,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBoolean--">toBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toDouble--">toDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toFloat--">toFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toInt--">toInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toLong--">toLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSLong.html b/docs/javadoc/org/iot/dsa/node/DSLong.html
index b230fe81..5f68adbb 100644
--- a/docs/javadoc/org/iot/dsa/node/DSLong.html
+++ b/docs/javadoc/org/iot/dsa/node/DSLong.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSLong (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSLong (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSLong (dslink-core 0.11.0 API)";
+            parent.document.title="DSLong (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -272,13 +272,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSMap.Entry.html b/docs/javadoc/org/iot/dsa/node/DSMap.Entry.html
index 3df75957..bc6ee2e2 100644
--- a/docs/javadoc/org/iot/dsa/node/DSMap.Entry.html
+++ b/docs/javadoc/org/iot/dsa/node/DSMap.Entry.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSMap.Entry (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSMap.Entry (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSMap.Entry (dslink-core 0.11.0 API)";
+            parent.document.title="DSMap.Entry (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSMap.html b/docs/javadoc/org/iot/dsa/node/DSMap.html
index 0f1e3ac1..2677771a 100644
--- a/docs/javadoc/org/iot/dsa/node/DSMap.html
+++ b/docs/javadoc/org/iot/dsa/node/DSMap.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSMap (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSMap (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSMap (dslink-core 0.11.0 API)";
+            parent.document.title="DSMap (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -233,7 +233,7 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMap.html#contains-java.lang.String-">contains</a></span>(java.lang.String&nbsp;key)</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMap.html#copy--">copy</a></span>()</code>
 <div class="block">If an object is mutable (list or map) then this should clone it, immutable objects can simply
  return themselves.</div>
@@ -504,7 +504,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSGroup.html" title="class in org.iot.dsa.node">DSGroup</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSGroup.html#first--">first</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-boolean-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-double-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-int-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-long-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getBoolean-int-">getBoolean</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getDouble-int-">getDouble</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getFloat-int-">getFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getInt-int-">getInt</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getList-int-">getList</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getLong-int-">getLong</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getMap-int-">getMap</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getString-int-">getString</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#indexOf-org.iot.dsa.node.DSElement-">indexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isEmpty--">isEmpty</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isNull-int-">isNull</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#last--">last</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#lastIndexOf-org.iot.dsa.node.DSElement-">lastIndexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeFirst--">removeFirst</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeLast--">removeLast</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toString--">toString</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSGroup.html#first--">first</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-boolean-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-double-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-int-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-long-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#get-int-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getBoolean-int-">getBoolean</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getDouble-int-">getDouble</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getFloat-int-">getFloat</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getInt-int-">getInt</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getList-int-">getList</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getLong-int-">getLong</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getMap-int-">getMap</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#getString-int-">getString</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#hasParent--">hasParent</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#indexOf-org.iot.dsa.node.DSElement-">indexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isEmpty--">isEmpty</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#isNull-int-">isNull</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#last--">last</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#lastIndexOf-org.iot.dsa.node.DSElement-">lastIndexOf</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeFirst--">removeFirst</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#removeLast--">removeLast</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSGroup.html#toString--">toString</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSElement">
@@ -514,13 +514,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBoolean--">toBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toDouble--">toDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toFloat--">toFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toInt--">toInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toLong--">toLong</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -617,7 +610,7 @@ <h4>contains</h4>
 <ul class="blockList">
 <li class="blockList">
 <h4>copy</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;copy()</pre>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;copy()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">DSElement</a></code></span></div>
 <div class="block">If an object is mutable (list or map) then this should clone it, immutable objects can simply
  return themselves.</div>
diff --git a/docs/javadoc/org/iot/dsa/node/DSMetadata.html b/docs/javadoc/org/iot/dsa/node/DSMetadata.html
index f8c7c93c..871347a3 100644
--- a/docs/javadoc/org/iot/dsa/node/DSMetadata.html
+++ b/docs/javadoc/org/iot/dsa/node/DSMetadata.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSMetadata (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSMetadata (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,14 +12,14 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSMetadata (dslink-core 0.11.0 API)";
+            parent.document.title="DSMetadata (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":9,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -147,34 +147,38 @@ <h3>Field Summary</h3>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#EDITOR">EDITOR</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#DISPLAY_NAME">DISPLAY_NAME</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#ENUM_RANGE">ENUM_RANGE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#EDITOR">EDITOR</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#MAX_VALUE">MAX_VALUE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#ENUM_RANGE">ENUM_RANGE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#MIN_VALUE">MIN_VALUE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#MAX_VALUE">MAX_VALUE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#NAME">NAME</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#MIN_VALUE">MIN_VALUE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#PLACEHOLDER">PLACEHOLDER</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#NAME">NAME</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#TYPE">TYPE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#PLACEHOLDER">PLACEHOLDER</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#TYPE">TYPE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#UNIT">UNIT</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -207,7 +211,7 @@ <h3>Constructor Summary</h3>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -246,147 +250,170 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getDisplayName--">getDisplayName</a></span>()</code>
+<div class="block">The alternate display name, or null.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getEditor--">getEditor</a></span>()</code>
 <div class="block">The editor, or null.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getEnumRange--">getEnumRange</a></span>()</code>
 <div class="block">The editor, or null.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getMap--">getMap</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getMaxValue--">getMaxValue</a></span>()</code>
 <div class="block">The max value, or null.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
+           <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</code>
+<div class="block">Fully acquires metadata about the info.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getMinValue--">getMinValue</a></span>()</code>
 <div class="block">The min value, or null.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getName--">getName</a></span>()</code>
 <div class="block">The name, or null.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getPlaceHolder--">getPlaceHolder</a></span>()</code>
 <div class="block">Placeholder text for text fields, or null.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getType--">getType</a></span>()</code>
 <div class="block">The type for action parameters, can be used to override types in the responder api.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#getUnit--">getUnit</a></span>()</code>
 <div class="block">Value if defined, otherwise null.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#isEmpty--">isEmpty</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#set-java.lang.String-org.iot.dsa.node.DSElement-">set</a></span>(java.lang.String&nbsp;key,
    <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;value)</code>
 <div class="block">Set arbitrary keys.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setBooleanRange-org.iot.dsa.node.DSList-">setBooleanRange</a></span>(<a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;range)</code>
 <div class="block">The list must be size 2 and the entries must not be null.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setBooleanRange-java.lang.String-java.lang.String-">setBooleanRange</a></span>(java.lang.String&nbsp;falseText,
                java.lang.String&nbsp;trueText)</code>
 <div class="block">The parameters can be null, which will result in the default text (false/true).</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setDecimalPlaces-org.iot.dsa.node.DSLong-">setDecimalPlaces</a></span>(<a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a>&nbsp;arg)</code>&nbsp;</td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setDefault-org.iot.dsa.node.DSIValue-">setDefault</a></span>(<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;arg)</code>
 <div class="block">Sets the default value only, does not set type information.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setDescription-java.lang.String-">setDescription</a></span>(java.lang.String&nbsp;arg)</code>&nbsp;</td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setDisplayName-java.lang.String-">setDisplayName</a></span>(java.lang.String&nbsp;arg)</code>&nbsp;</td>
+</tr>
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setEditor-java.lang.String-">setEditor</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">See the EDITOR_ constants.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setEnumRange-org.iot.dsa.node.DSList-">setEnumRange</a></span>(<a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;arg)</code>
-<div class="block">See the EDITOR_ constants.</div>
+<div class="block">List of string values for an enum or string.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i27" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setEnumRange-java.lang.String...-">setEnumRange</a></span>(java.lang.String...&nbsp;range)</code>
+<div class="block">List of string values for an enum or string.</div>
+</td>
+</tr>
+<tr id="i28" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setMap-org.iot.dsa.node.DSMap-">setMap</a></span>(<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;arg)</code>
 <div class="block">Change the underlying map so the metadata instance can be reused.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setMaxValue-org.iot.dsa.node.DSElement-">setMaxValue</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">The arg should be a number.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setMinValue-org.iot.dsa.node.DSElement-">setMinValue</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">The arg should be a number.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setName-java.lang.String-">setName</a></span>(java.lang.String&nbsp;arg)</code>&nbsp;</td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setPlaceHolder-java.lang.String-">setPlaceHolder</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Place holder text for text fields.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setType-org.iot.dsa.node.DSIValue-">setType</a></span>(<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;arg)</code>
 <div class="block">Sets the type and if the given is an enum, sets the enum range as well.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setType-org.iot.dsa.node.DSValueType-">setType</a></span>(<a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a>&nbsp;arg)</code>
 <div class="block">The type for action parameters, can be used to override types in the responder api.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSMetadata.html#setUnit-java.lang.String-">setUnit</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">The unit identifier.</div>
@@ -466,6 +493,19 @@ <h4>DEFAULT</h4>
 </dl>
 </li>
 </ul>
+<a name="DISPLAY_NAME">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DISPLAY_NAME</h4>
+<pre>public static final&nbsp;java.lang.String DISPLAY_NAME</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.iot.dsa.node.DSMetadata.DISPLAY_NAME">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="EDITOR">
 <!--   -->
 </a>
@@ -672,6 +712,16 @@ <h4>getDescription</h4>
 <div class="block">The description, or null.</div>
 </li>
 </ul>
+<a name="getDisplayName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDisplayName</h4>
+<pre>public&nbsp;java.lang.String&nbsp;getDisplayName()</pre>
+<div class="block">The alternate display name, or null.</div>
+</li>
+</ul>
 <a name="getEditor--">
 <!--   -->
 </a>
@@ -702,6 +752,27 @@ <h4>getMaxValue</h4>
 <div class="block">The max value, or null.</div>
 </li>
 </ul>
+<a name="getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMetadata</h4>
+<pre>public static&nbsp;<a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;getMetadata(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
+                                <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</pre>
+<div class="block">Fully acquires metadata about the info.  If the target of the info implements DSIMetadata,
+ it is put in the bucket first.  Then if the parent node is allowed is given the the chance
+ to add/edit the bucket.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>info</code> - Who to get metadata for.</dd>
+<dd><code>bucket</code> - Where to put the metadata, can be null in which case a new map will be
+               instantiated.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The bucket arg, or a new map if the arg was null.</dd>
+</dl>
+</li>
+</ul>
 <a name="getMinValue--">
 <!--   -->
 </a>
@@ -821,6 +892,15 @@ <h4>setDescription</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a>&nbsp;setDescription(java.lang.String&nbsp;arg)</pre>
 </li>
 </ul>
+<a name="setDisplayName-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setDisplayName</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a>&nbsp;setDisplayName(java.lang.String&nbsp;arg)</pre>
+</li>
+</ul>
 <a name="setEditor-java.lang.String-">
 <!--   -->
 </a>
@@ -838,7 +918,17 @@ <h4>setEditor</h4>
 <li class="blockList">
 <h4>setEnumRange</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a>&nbsp;setEnumRange(<a href="../../../../org/iot/dsa/node/DSList.html" title="class in org.iot.dsa.node">DSList</a>&nbsp;arg)</pre>
-<div class="block">See the EDITOR_ constants.</div>
+<div class="block">List of string values for an enum or string.</div>
+</li>
+</ul>
+<a name="setEnumRange-java.lang.String...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setEnumRange</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSMetadata.html" title="class in org.iot.dsa.node">DSMetadata</a>&nbsp;setEnumRange(java.lang.String...&nbsp;range)</pre>
+<div class="block">List of string values for an enum or string.</div>
 </li>
 </ul>
 <a name="setMap-org.iot.dsa.node.DSMap-">
diff --git a/docs/javadoc/org/iot/dsa/node/DSNode.html b/docs/javadoc/org/iot/dsa/node/DSNode.html
index b119fddf..c5261f04 100644
--- a/docs/javadoc/org/iot/dsa/node/DSNode.html
+++ b/docs/javadoc/org/iot/dsa/node/DSNode.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSNode (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSNode (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSNode (dslink-core 0.11.0 API)";
+            parent.document.title="DSNode (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":9,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":9,"i57":10,"i58":10,"i59":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":9,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":9,"i71":10,"i72":10,"i73":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -74,13 +74,13 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -113,262 +113,157 @@ <h2 title="Class DSNode" class="title">Class DSNode</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
 </dl>
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>, <a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>, <a href="../../../../org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink">DSRootNode</a></dd>
+<dd><a href="../../../../org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink">DSLink</a>, <a href="../../../../org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink">DSLinkConnection</a>, <a href="../../../../org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink">DSMainNode</a>, <a href="../../../../org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink">DSSysNode</a>, <a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSNode</span>
 extends <a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a>
 implements <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;</pre>
-<div class="block">The primary organization unit of the node tree.  Most links will bind their specific logic by
+<div class="block">The organizational unit of the node tree.  Most links will bind their specific logic by
  subclassing DSNode and utilizing the lifecycle callbacks.
-
+ <p>
  To create a node subclass,  you should understand the following concepts:
-
  <p>
-
  <ul>
-
  <li>Constructors
-
  <li>Defaults
-
  <li>Node Lifecycle and Callbacks
-
  <li>Subscriptions
-
  <li>Values
-
  <li>Actions
-
  <li>DSInfo
-
  </ul>
-
  <p>
-
  <h3>Constructors</h3>
-
+ <p>
  DSNode sub-classes must support the public no-arg constructor.  This is how they will be
  instantiated when deserializing the configuration database.
-
  <p>
-
  <h3>Defaults</h3>
-
  <p>
-
  Every subtype of DSNode has a private default instance, all other instances of any particular
  type are copies of the default instance.  You should never perform application logic unless your
  node is running (started or stable) because of this.
-
+ <p>
  If a DSNode subtype needs to have specific child nodes or values (most will), it should override
  the declareDefaults method.  The method should:
-
  <p>
-
  <ul>
-
  <li> Call super.declareDefaults();
-
  <li> Call DSNode.declareDefault(String name, DSIObject child) for each non-removable child.  Do
  not add dynamic children in declareDefaults, because if they are removed, they will be re-added
  the next time the link is restarted.
-
  </ul>
-
  <p>
-
  During node serialization (configuration database, not DSA interop), children that match their
  declared default are omitted.  This has two benefits:
-
  <p>
-
  <ul>
-
  <li> Smaller node database means faster serialization / deserialization.
-
  <li> Default values can be modified and all existing database will be automatically upgraded the
  next time the updated class loaded.
-
  </ul>
-
  <p>
-
  <h3>Lifecycle</h3>
-
  <p>
-
-
  It is important to know the node lifecycle.  Your nodes should not execute any application logic
  unless they are running (started or stable).
-
  <p>
-
  <b>Stopped</b>
-
  <p>
-
  A node is instantiated in the stopped state.  If a node tree has been persisted, will be be fully
  restored in the stopped state.  DSNode.onStopped will not be called, it is only called when nodes
  transition from running to stopped.
-
  <p>
-
  When nodes are removed from a running parent node, they will be stopped.  DSNode.onStopped will
  be called after all child nodes have been stopped.
-
  <p>
-
  When a link is stopped, an attempt to stop the tree will be made, but it cannot be guaranteed.
-
  <p>
-
  <b>Started</b>
-
  <p>
-
  After the node tree is fully deserialized it will be started.  A node's onStart method will be
  called after all of its child nodes have been started.  The only guarantee is that all child
  nodes have been started.
-
  <p>
-
  Nodes will also started when they are added to an already running parent node.
-
  <p>
-
  <b>Stable</b>
-
  <p>
-
  Stable is called after the entire tree has been started.  The first time the node tree is loaded,
  there is a stable delay of 5 seconds.  This is configurable as <b>stableDelay</b> in
  <i>slink.json</i>.
-
  <p>
-
  Nodes added to an already stable parent will have onStart and onStable called immediately.
-
  <p>
-
  When in doubt of whether to use onStarted or onStable, use onStable.
-
+ <p>
  <b>Other Callbacks</b>
-
  <p>
-
  When a node is stable, there are several other callbacks for various state changes.  All
  callbacks begin with **on** such as onChildAdded().
-
  <p>
-
  <h3>Subscriptions</h3>
-
  <p>
-
  Nodes should suspend, or minimize activity when nothing is interested in them.  For example, if
  nothing is interested in a point, it is best to not poll the point on the foreign system.
-
  <p>
-
  To do this you use the following APIs:
-
  <p>
-
  <ul>
-
  <li>DSNode.onSubscribed - Called when the node transitions from unsubscribed to subscribed.  This
  is not called for subsequent subscribers once in the subscribed state.
-
  <li>DSNode.onUnsubscribed - Called when the node transitions from subscribed to unsubscribed. If
  there are multiple subscribers, this is only called when the last one unsubscribes.
-
  <li>DSNode.isSubscribed - Tells the caller whether or not the node is subscribed.
-
  </ul>
-
  <p>
-
  <h3>Values</h3>
-
  <p>
-
  Values mostly represent leaf members of the node tree.  There are two types of values:
-
  <p>
-
  <ul>
-
  <li>DSElement - These map to the JSON type system and represent leaf members of the node tree.
-
  <li>DSIValue - These don't map to the JSON type system, and it is possible for nodes to implement
  this interface. This allows for values to have children.
-
  </ul>
-
  <p>
-
  Many values are singleton instances.  This is for efficiency, the same value instance (e.g.
  DSBoolean.TRUE) can be stored in many nodes. Singleton values must be immutable.
-
  <p>
-
  Whenever possible, values should also have NULL instance.  Rather than storing a generic null,
  this helps the system decode the proper type such as when a requester is attempting to set a
  value.
-
  <p>
-
  <h3>Actions</h3>
-
  <p>
-
  Add actions to your node to allow requester invocation using org.iot.dsa.node.action.DSAction.
-
  <p>
-
  Override DSNode.onInvoke to handle invocations.  The reason for this is complicated but it is
  possible to subclass DSAction, just carefully read the javadoc if you do.  Be sure to call
  super.onInvoke() when overriding that method.
-
  <p>
-
  <h3>DSInfo</h3>
-
  <p>
-
  All node children have corresponding DSInfo instances.  This type serves two purposes:
-
  <p>
-
  <ul>
-
  <li>It carries some meta-data about the relationship between the parent node and the child.
-
  <li>It tracks whether or not the child matches a declared default.
-
  </ul>
-
  <p>
-
  Important things for developers to know about DSInfo are:
-
  <p>
-
  <ul>
-
  <li>You can configure state such as transient, readonly and hidden.
-
  <li>You can declare fields in the your Java class for default info instances to avoid looking up
  the child every time it is needed.  This is can be used to create fast getters and setters.
-
  </ul>
-
  <p></div>
 </li>
 </ul>
@@ -376,6 +271,36 @@ <h3>DSInfo</h3>
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></span></code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -413,363 +338,469 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#childChanged-org.iot.dsa.node.DSInfo-">childChanged</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</code>
-<div class="block">Can be used to force a child changed event for the given child.</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a></span>()</code>
 <div class="block">The number of children.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a></span>()</code>
 <div class="block">Removes non-permanent children.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a></span>(java.lang.String&nbsp;key)</code>
 <div class="block">Whether or not this node has a child with the given name.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a></span>()</code>
 <div class="block">Returns a clone of this node and its subtree.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>protected <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a></span>(java.lang.String&nbsp;name,
               <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;value)</code>
 <div class="block">Use this in the declareDefaults method to create a non-removable child.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a></span>()</code>
 <div class="block">The is only called once for each class.</div>
 </td>
 </tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+    <a href="../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>&nbsp;event,
+    <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</code>
+<div class="block">Notifies subscribers of the event.</div>
+</td>
+</tr>
 <tr id="i8" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+    <a href="../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>&nbsp;event,
+    <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+    java.lang.Object...&nbsp;params)</code>
+<div class="block">Notifies subscribers of the event.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the child value with the given name, or null.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">A convenience for (DSElement) get(name).</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a></span>()</code>
 <div class="block">The first child, or null.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a></span>()</code>
 <div class="block">The first child info, or null.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a></span>()</code>
 <div class="block">The info for the first child node, or null.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a></span>()</code>
 <div class="block">DSInfo for this node in its parent, or null if un-parented.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the info for the child with the given name, or null.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a></span>()</code>
 <div class="block">The last child, or null.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a></span>()</code>
 <div class="block">The last child info, or null.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
-<td class="colFirst"><code>java.util.logging.Logger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getLogger--">getLogger</a></span>()</code>
-<div class="block">Ascends the tree until a logger is found.</div>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>protected java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getLogName--">getLogName</a></span>()</code>
+<div class="block">Override point, returns the simple class name by default.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
            <a href="../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;bucket)</code>
 <div class="block">Override point, add any meta data for the given info to the provided bucket.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a></span>()</code>
 <div class="block">Returns the name of this node in its parent, or null if un-parented.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">A convenience for (DSNode) get(name).</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a></span>()</code>
 <div class="block">Returns the parent node, or null.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a></span>()</code>
 <div class="block">The DSA path, properly encoded.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">A convenience for (DSIValue) get(name).</div>
+</td>
+</tr>
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a></span>()</code>
 <div class="block">True if this is the default instance for the type.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a></span>(java.lang.Object&nbsp;arg)</code>
 <div class="block">True if the argument is a node with the same children, although their order can be
  different.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a></span>(java.lang.Object&nbsp;arg)</code>
 <div class="block">True if the argument is a node with the same children in the exact same order.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>protected static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a></span>(java.lang.Object&nbsp;obj)</code>
 <div class="block">Convenience for instanceof DSNode.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a></span>()</code>
 <div class="block">Returns false.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a></span>()</code>
 <div class="block">A convenience for !isStopped().</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a></span>()</code>
 <div class="block">True after stable is called, children are stable before their parents.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a></span>()</code>
 <div class="block">True after start is called, children are started before their parents.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a></span>()</code>
 <div class="block">True after stop is called, children are stopped before their parents.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a></span>()</code>
 <div class="block">True if there are any subscribers.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i35" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+            <a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic)</code>
+<div class="block">True if there are any subscriptions with the matching child and topic.</div>
+</td>
+</tr>
+<tr id="i36" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic)</code>
+<div class="block">True if there any subscriptions for the given topic.</div>
+</td>
+</tr>
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>java.util.Iterator&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a></span>()</code>
 <div class="block">Returns an info iterator of child DSNodes.</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>java.util.Iterator&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a></span>()</code>
 <div class="block">Returns an info iterator of child DSIValues.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>java.util.Iterator&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a></span>()</code>
 <div class="block">Returns an info iterator of all children.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
-<td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#nodeChanged--">nodeChanged</a></span>()</code>
-<div class="block">Fires a publisher changed event for this node.</div>
-</td>
-</tr>
-<tr id="i36" class="altColor">
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</code>
 <div class="block">Called when the given child is added and in the stable state.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</code>
 <div class="block">Called when the given child is changed and in the stable state.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i42" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</code>
 <div class="block">Called when the given child is removed and in the stable state.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</code>
 <div class="block">Called when the given info is modified and in the stable state.</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;actionInfo,
         <a href="../../../../org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a>&nbsp;invocation)</code>
 <div class="block">Override point, called by the default implementation of DSAction.invoke.</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
      <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</code>
 <div class="block">Override point, called when a value being set.</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i46" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a></span>(<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</code>
 <div class="block">Override point, called only when a DSNode subclass implements DSIValue is being set.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a></span>()</code>
 <div class="block">Called once this node is stable, but before stable is called on children.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i48" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a></span>()</code>
 <div class="block">Called once this node and its entire subtree is started.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i49" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a></span>()</code>
 <div class="block">Called once this node and its entire subtree is stopped.</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i50" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+           <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+           <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</code>
+<div class="block">Called for every subscription.</div>
+</td>
+</tr>
+<tr id="i51" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a></span>()</code>
-<div class="block">Called when this node transitions from unsubscribed to subscribed.</div>
+<div class="block">Called when this node transitions from having no subscriptions to having a subscription of
+ any kind.</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i52" class="altColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+            <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</code>
+<div class="block">Called when the child and topic pair transitions from having no subscriptions to have a
+ subscription.</div>
+</td>
+</tr>
+<tr id="i53" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+             <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+             <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</code>
+<div class="block">Called for every unsubscribe.</div>
+</td>
+</tr>
+<tr id="i54" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a></span>()</code>
-<div class="block">Called when this node transitions from subscribed to unsubscribed.</div>
+<div class="block">Called when this node transitions to having no subscriptions of any kind.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i55" class="rowColor">
+<td class="colFirst"><code>protected void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+              <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</code>
+<div class="block">Called when the child and topic pair transitions to having no subscriptions.</div>
+</td>
+</tr>
+<tr id="i56" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
    <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;object)</code>
 <div class="block">Replaces the child.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i57" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put</a></span>(java.lang.String&nbsp;name,
+   boolean&nbsp;arg)</code>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</td>
+</tr>
+<tr id="i58" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put</a></span>(java.lang.String&nbsp;name,
+   double&nbsp;arg)</code>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</td>
+</tr>
+<tr id="i59" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a></span>(java.lang.String&nbsp;name,
    <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;object)</code>
 <div class="block">Adds or replaces the named child.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i60" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put</a></span>(java.lang.String&nbsp;name,
+   float&nbsp;arg)</code>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</td>
+</tr>
+<tr id="i61" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put</a></span>(java.lang.String&nbsp;name,
+   int&nbsp;arg)</code>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</td>
+</tr>
+<tr id="i62" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put</a></span>(java.lang.String&nbsp;name,
+   long&nbsp;arg)</code>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</td>
+</tr>
+<tr id="i63" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put</a></span>(java.lang.String&nbsp;name,
+   java.lang.String&nbsp;arg)</code>
+<div class="block">A convenience for put(String, DSIObject)</div>
+</td>
+</tr>
+<tr id="i64" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</code>
 <div class="block">Removes the child.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i65" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Remove the named child if it is contained.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i66" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a></span>()</code>
 <div class="block">Called after the entire subtree is started.</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i67" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a></span>()</code>
 <div class="block">Sets the state to starting.</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i68" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a></span>()</code>
 <div class="block">Sets the state to stopped.</div>
 </td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i69" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.DSISubscriber-">subscribe</a></span>(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;arg)</code>
-<div class="block">There can be multiple subscribers but will only call onSubscribed when the node transitions
- from unsubscribed to subscribed.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+         <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+         <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</code>
+<div class="block">Subscribes the child and topic.</div>
 </td>
 </tr>
-<tr id="i56" class="altColor">
+<tr id="i70" class="altColor">
 <td class="colFirst"><code>protected static <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a></span>(java.lang.Object&nbsp;obj)</code>
 <div class="block">A convenience that casts the argument to a node.</div>
 </td>
 </tr>
-<tr id="i57" class="rowColor">
+<tr id="i71" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.DSISubscriber-">unsubscribe</a></span>(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;arg)</code>
-<div class="block">There can be multiple subscribers but this will only call onUnsubscribed when the node
- transitions from subscribed to unsubscribed.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe</a></span>(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+           <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+           <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</code>
+<div class="block">Unsubscribes the tuple.</div>
 </td>
 </tr>
-<tr id="i58" class="altColor">
+<tr id="i72" class="altColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a></span>(<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>&nbsp;obj)</code>
 <div class="block">Override point, throw a meaningful IllegalArgumentException if the child is not allowed</div>
 </td>
 </tr>
-<tr id="i59" class="rowColor">
+<tr id="i73" class="rowColor">
 <td class="colFirst"><code>protected void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></span>(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</code>
 <div class="block">Override point, throw a meaningful IllegalArgumentException if the parent is not allowed</div>
@@ -781,7 +812,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
-<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#config--">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#config-java.lang.Object-">config</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer--">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finer-java.lang.Object-java.lang.Throwable-">finer</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest--">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#finest-java.lang.Object-java.lang.Throwable-">finest</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe--">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#severe-java.lang.Object-java.lang.Throwable-">severe</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
+<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -805,6 +836,32 @@ <h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INFO_TOPIC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>INFO_TOPIC</h4>
+<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a> INFO_TOPIC</pre>
+</li>
+</ul>
+<a name="VALUE_TOPIC">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>VALUE_TOPIC</h4>
+<pre>public static final&nbsp;<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a> VALUE_TOPIC</pre>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.detail">
@@ -849,16 +906,6 @@ <h4>add</h4>
 </dl>
 </li>
 </ul>
-<a name="childChanged-org.iot.dsa.node.DSInfo-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>childChanged</h4>
-<pre>public&nbsp;void&nbsp;childChanged(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info)</pre>
-<div class="block">Can be used to force a child changed event for the given child.</div>
-</li>
-</ul>
 <a name="childCount--">
 <!--   -->
 </a>
@@ -942,6 +989,44 @@ <h4>declareDefaults</h4>
 </dl>
 </li>
 </ul>
+<a name="fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fire</h4>
+<pre>protected&nbsp;void&nbsp;fire(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                    <a href="../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>&nbsp;event,
+                    <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</pre>
+<div class="block">Notifies subscribers of the event.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Must not be null.</dd>
+<dd><code>event</code> - Must not be null.</dd>
+<dd><code>child</code> - Can be null.</dd>
+</dl>
+</li>
+</ul>
+<a name="fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>fire</h4>
+<pre>protected&nbsp;void&nbsp;fire(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                    <a href="../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>&nbsp;event,
+                    <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+                    java.lang.Object...&nbsp;params)</pre>
+<div class="block">Notifies subscribers of the event.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Must not be null.</dd>
+<dd><code>event</code> - Must not be null.</dd>
+<dd><code>child</code> - Can be null.</dd>
+<dd><code>params</code> - Optional</dd>
+</dl>
+</li>
+</ul>
 <a name="get-java.lang.String-">
 <!--   -->
 </a>
@@ -956,6 +1041,16 @@ <h4>get</h4>
 </dl>
 </li>
 </ul>
+<a name="getElement-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getElement</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;getElement(java.lang.String&nbsp;name)</pre>
+<div class="block">A convenience for (DSElement) get(name).</div>
+</li>
+</ul>
 <a name="getInfo--">
 <!--   -->
 </a>
@@ -1030,18 +1125,18 @@ <h4>getLastInfo</h4>
 <div class="block">The last child info, or null.</div>
 </li>
 </ul>
-<a name="getLogger--">
+<a name="getLogName--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getLogger</h4>
-<pre>public&nbsp;java.util.logging.Logger&nbsp;getLogger()</pre>
-<div class="block">Ascends the tree until a logger is found.  If overriding, call super.getLogger and set the
- result as the parent logger of your new logger.</div>
+<h4>getLogName</h4>
+<pre>protected&nbsp;java.lang.String&nbsp;getLogName()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">DSLogger</a></code></span></div>
+<div class="block">Override point, returns the simple class name by default.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogger--">getLogger</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/logging/DSLogger.html#getLogName--">getLogName</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -1096,6 +1191,16 @@ <h4>getPath</h4>
 <div class="block">The DSA path, properly encoded.</div>
 </li>
 </ul>
+<a name="getValue-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValue</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;getValue(java.lang.String&nbsp;name)</pre>
+<div class="block">A convenience for (DSIValue) get(name).</div>
+</li>
+</ul>
 <a name="isDefaultInstance--">
 <!--   -->
 </a>
@@ -1205,6 +1310,32 @@ <h4>isSubscribed</h4>
 <div class="block">True if there are any subscribers.</div>
 </li>
 </ul>
+<a name="isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isSubscribed</h4>
+<pre>public&nbsp;boolean&nbsp;isSubscribed(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+                            <a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic)</pre>
+<div class="block">True if there are any subscriptions with the matching child and topic.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>child</code> - Can be null.</dd>
+<dd><code>topic</code> - Can be null.</dd>
+</dl>
+</li>
+</ul>
+<a name="isSubscribed-org.iot.dsa.node.event.DSTopic-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isSubscribed</h4>
+<pre>public&nbsp;boolean&nbsp;isSubscribed(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic)</pre>
+<div class="block">True if there any subscriptions for the given topic.</div>
+</li>
+</ul>
 <a name="iterateNodes--">
 <!--   -->
 </a>
@@ -1239,17 +1370,6 @@ <h4>iterator</h4>
 </dl>
 </li>
 </ul>
-<a name="nodeChanged--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>nodeChanged</h4>
-<pre>protected&nbsp;void&nbsp;nodeChanged()</pre>
-<div class="block">Fires a publisher changed event for this node.  Useful if the node is also a DSIValue and you
- want to notify listeners of a value change.</div>
-</li>
-</ul>
 <a name="onChildAdded-org.iot.dsa.node.DSInfo-">
 <!--   -->
 </a>
@@ -1343,13 +1463,33 @@ <h4>onSet</h4>
 <h4>onSet</h4>
 <pre>public&nbsp;void&nbsp;onSet(<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</pre>
 <div class="block">Override point, called only when a DSNode subclass implements DSIValue is being set.  This
- will throw and IllegalStateException if not overridden and called. Throw an exception to
+ will throw and IllegalStateException if not overridden. You should store the value of the
+ node as a child and call put in override implementation.  Throw an exception to
  report an error to the requester.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>value</code> - The new value.</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-"><code>DSIResponder.onSet(InboundSetRequest)</code></a></dd>
+<dd><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-"><code>DSIResponder.onSet(InboundSetRequest)</code></a>, 
+<a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><code>DSValueNode</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onSubscribe</h4>
+<pre>protected&nbsp;void&nbsp;onSubscribe(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                           <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+                           <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</pre>
+<div class="block">Called for every subscription.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Will not be null.</dd>
+<dd><code>child</code> - Can be null.</dd>
+<dd><code>subscriber</code> - Will not be null.</dd>
 </dl>
 </li>
 </ul>
@@ -1360,7 +1500,24 @@ <h4>onSet</h4>
 <li class="blockList">
 <h4>onSubscribed</h4>
 <pre>protected&nbsp;void&nbsp;onSubscribed()</pre>
-<div class="block">Called when this node transitions from unsubscribed to subscribed.</div>
+<div class="block">Called when this node transitions from having no subscriptions to having a subscription of
+ any kind.</div>
+</li>
+</ul>
+<a name="onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onSubscribed</h4>
+<pre>protected&nbsp;void&nbsp;onSubscribed(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                            <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</pre>
+<div class="block">Called when the child and topic pair transitions from having no subscriptions to have a
+ subscription.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>child</code> - Can be null, which indicates node subscriptions.</dd>
+</dl>
 </li>
 </ul>
 <a name="onStable--">
@@ -1393,6 +1550,24 @@ <h4>onStopped</h4>
 <div class="block">Called once this node and its entire subtree is stopped.</div>
 </li>
 </ul>
+<a name="onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onUnsubscribe</h4>
+<pre>protected&nbsp;void&nbsp;onUnsubscribe(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                             <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+                             <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</pre>
+<div class="block">Called for every unsubscribe.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Will not be null.</dd>
+<dd><code>child</code> - Can be null.</dd>
+<dd><code>subscriber</code> - Will not be null.</dd>
+</dl>
+</li>
+</ul>
 <a name="onUnsubscribed--">
 <!--   -->
 </a>
@@ -1400,7 +1575,23 @@ <h4>onStopped</h4>
 <li class="blockList">
 <h4>onUnsubscribed</h4>
 <pre>protected&nbsp;void&nbsp;onUnsubscribed()</pre>
-<div class="block">Called when this node transitions from subscribed to unsubscribed.</div>
+<div class="block">Called when this node transitions to having no subscriptions of any kind.</div>
+</li>
+</ul>
+<a name="onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onUnsubscribed</h4>
+<pre>protected&nbsp;void&nbsp;onUnsubscribed(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                              <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</pre>
+<div class="block">Called when the child and topic pair transitions to having no subscriptions.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Can not be null.</dd>
+<dd><code>child</code> - Can be null.</dd>
+</dl>
 </li>
 </ul>
 <a name="put-java.lang.String-org.iot.dsa.node.DSIObject-">
@@ -1418,6 +1609,96 @@ <h4>put</h4>
 </dl>
 </li>
 </ul>
+<a name="put-java.lang.String-boolean-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>put</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;put(java.lang.String&nbsp;name,
+                  boolean&nbsp;arg)</pre>
+<div class="block">A convenience for put(String, DSIObject)</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The info for the child.</dd>
+</dl>
+</li>
+</ul>
+<a name="put-java.lang.String-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>put</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;put(java.lang.String&nbsp;name,
+                  double&nbsp;arg)</pre>
+<div class="block">A convenience for put(String, DSIObject)</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The info for the child.</dd>
+</dl>
+</li>
+</ul>
+<a name="put-java.lang.String-float-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>put</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;put(java.lang.String&nbsp;name,
+                  float&nbsp;arg)</pre>
+<div class="block">A convenience for put(String, DSIObject)</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The info for the child.</dd>
+</dl>
+</li>
+</ul>
+<a name="put-java.lang.String-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>put</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;put(java.lang.String&nbsp;name,
+                  int&nbsp;arg)</pre>
+<div class="block">A convenience for put(String, DSIObject)</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The info for the child.</dd>
+</dl>
+</li>
+</ul>
+<a name="put-java.lang.String-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>put</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;put(java.lang.String&nbsp;name,
+                  long&nbsp;arg)</pre>
+<div class="block">A convenience for put(String, DSIObject)</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The info for the child.</dd>
+</dl>
+</li>
+</ul>
+<a name="put-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>put</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;put(java.lang.String&nbsp;name,
+                  java.lang.String&nbsp;arg)</pre>
+<div class="block">A convenience for put(String, DSIObject)</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The info for the child.</dd>
+</dl>
+</li>
+</ul>
 <a name="put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">
 <!--   -->
 </a>
@@ -1465,17 +1746,6 @@ <h4>remove</h4>
 </dl>
 </li>
 </ul>
-<a name="subscribe-org.iot.dsa.node.DSISubscriber-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>subscribe</h4>
-<pre>public&nbsp;void&nbsp;subscribe(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;arg)</pre>
-<div class="block">There can be multiple subscribers but will only call onSubscribed when the node transitions
- from unsubscribed to subscribed.</div>
-</li>
-</ul>
 <a name="stable--">
 <!--   -->
 </a>
@@ -1508,6 +1778,24 @@ <h4>stop</h4>
  onChildrenStopped after all child nodes are stopped.</div>
 </li>
 </ul>
+<a name="subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>subscribe</h4>
+<pre>public&nbsp;void&nbsp;subscribe(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                      <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+                      <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</pre>
+<div class="block">Subscribes the child and topic.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Can not be null.</dd>
+<dd><code>child</code> - Can be null, and cannot be a child node.</dd>
+<dd><code>subscriber</code> - Can not be null.</dd>
+</dl>
+</li>
+</ul>
 <a name="toNode-java.lang.Object-">
 <!--   -->
 </a>
@@ -1518,15 +1806,22 @@ <h4>toNode</h4>
 <div class="block">A convenience that casts the argument to a node.</div>
 </li>
 </ul>
-<a name="unsubscribe-org.iot.dsa.node.DSISubscriber-">
+<a name="unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>unsubscribe</h4>
-<pre>public&nbsp;void&nbsp;unsubscribe(<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>&nbsp;arg)</pre>
-<div class="block">There can be multiple subscribers but this will only call onUnsubscribed when the node
- transitions from subscribed to unsubscribed.</div>
+<pre>public&nbsp;void&nbsp;unsubscribe(<a href="../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                        <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+                        <a href="../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a>&nbsp;subscriber)</pre>
+<div class="block">Unsubscribes the tuple.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Can not be null.</dd>
+<dd><code>child</code> - Can be null.</dd>
+<dd><code>subscriber</code> - Can not be null.</dd>
+</dl>
 </li>
 </ul>
 <a name="validateChild-org.iot.dsa.node.DSIObject-">
@@ -1602,13 +1897,13 @@ <h4>validateParent</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/node/DSNull.html b/docs/javadoc/org/iot/dsa/node/DSNull.html
index 2d03e2b6..79f09cf3 100644
--- a/docs/javadoc/org/iot/dsa/node/DSNull.html
+++ b/docs/javadoc/org/iot/dsa/node/DSNull.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSNull (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSNull (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSNull (dslink-core 0.11.0 API)";
+            parent.document.title="DSNull (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -124,8 +124,8 @@ <h2 title="Class DSNull" class="title">Class DSNull</h2>
 <br>
 <pre>public class <span class="typeNameLabel">DSNull</span>
 extends <a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></pre>
-<div class="block">This is used for decoding raw json.  Try to use strong typed null instances instead (e.g.
- DBool.NULL).</div>
+<div class="block">Try not to use, it is for decoding raw json.  Try to use strong typed null instances instead
+ (e.g. DBool.NULL).</div>
 </li>
 </ul>
 </div>
@@ -220,13 +220,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isString--">isString</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBoolean--">toBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toDouble--">toDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toFloat--">toFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toInt--">toInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toLong--">toLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSPath.html b/docs/javadoc/org/iot/dsa/node/DSPath.html
index 5daeb17b..51d78afa 100644
--- a/docs/javadoc/org/iot/dsa/node/DSPath.html
+++ b/docs/javadoc/org/iot/dsa/node/DSPath.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSPath (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSPath (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSPath (dslink-core 0.11.0 API)";
+            parent.document.title="DSPath (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":10,"i6":10,"i7":10,"i8":9,"i9":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":10,"i10":10,"i11":10,"i12":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -147,59 +147,83 @@ <h3>Method Summary</h3>
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static java.lang.String[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#decodePath-java.lang.String-">decodePath</a></span>(java.lang.String&nbsp;path)</code>
-<div class="block">Splits the path and decodes each individual name.</div>
+<td class="colFirst"><code>static java.lang.StringBuilder</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#concat-java.lang.String-java.lang.String-java.lang.StringBuilder-">concat</a></span>(java.lang.String&nbsp;leading,
+      java.lang.String&nbsp;trailing,
+      java.lang.StringBuilder&nbsp;bucket)</code>
+<div class="block">Concatenates the two paths into the given bucket.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#decodePathName-java.lang.String-">decodePathName</a></span>(java.lang.String&nbsp;pathName)</code>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#decodeName-java.lang.String-">decodeName</a></span>(java.lang.String&nbsp;pathName)</code>
 <div class="block">Un-escapes a name.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
+<td class="colFirst"><code>static java.lang.String[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#decodePath-java.lang.String-">decodePath</a></span>(java.lang.String&nbsp;path)</code>
+<div class="block">Splits the path and decodes each individual name.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#encodeName-java.lang.String-">encodeName</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Encodes a name for being in a path.</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#encodeName-java.lang.String-java.lang.StringBuilder-">encodeName</a></span>(java.lang.String&nbsp;name,
           java.lang.StringBuilder&nbsp;buf)</code>
 <div class="block">Encodes a name for being in a path.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#encodeNameV1-java.lang.String-java.lang.StringBuilder-">encodeNameV1</a></span>(java.lang.String&nbsp;name,
+            java.lang.StringBuilder&nbsp;buf)</code>
+<div class="block">Encodes a DSA v1 name for use outside of a path.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#encodePath-boolean-java.lang.String...-">encodePath</a></span>(boolean&nbsp;leadingSlash,
+          java.lang.String...&nbsp;names)</code>
+<div class="block">Creates a properly encoded path from the given names.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#encodePath-boolean-java.lang.String:A-int-">encodePath</a></span>(boolean&nbsp;leadingSlash,
+          java.lang.String[]&nbsp;names,
+          int&nbsp;len)</code>
+<div class="block">Creates a properly encoded path from the given names.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#encodePath-org.iot.dsa.node.DSNode-">encodePath</a></span>(<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node)</code>
 <div class="block">Ascends the tree and encodes all the node names into a path.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#getLastPathElement--">getLastPathElement</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#getPath--">getPath</a></span>()</code>
 <div class="block">The raw fully encoded path.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>java.lang.String[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#getPathElements--">getPathElements</a></span>()</code>
 <div class="block">The individual, decoded path elements.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#shouldEncode-int-">shouldEncode</a></span>(int&nbsp;ch)</code>
-<div class="block">Returns true for characters that should be encoded.</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static java.lang.String[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSPath.html#splitPath-java.lang.String-">splitPath</a></span>(java.lang.String&nbsp;path)</code>
 <div class="block">Splits the path, but does not decode any names.</div>
@@ -244,13 +268,32 @@ <h4>DSPath</h4>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="decodePathName-java.lang.String-">
+<a name="concat-java.lang.String-java.lang.String-java.lang.StringBuilder-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>concat</h4>
+<pre>public static&nbsp;java.lang.StringBuilder&nbsp;concat(java.lang.String&nbsp;leading,
+                                             java.lang.String&nbsp;trailing,
+                                             java.lang.StringBuilder&nbsp;bucket)</pre>
+<div class="block">Concatenates the two paths into the given bucket.  Insures a single forward slash character
+ separates them. The bucket will not be cleared, the path will be appended to it.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>bucket</code> - Can be null, in which case a new buffer will be created.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The given bucket, or a new one if that was null, with the complete path appended.</dd>
+</dl>
+</li>
+</ul>
+<a name="decodeName-java.lang.String-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>decodePathName</h4>
-<pre>public static&nbsp;java.lang.String&nbsp;decodePathName(java.lang.String&nbsp;pathName)</pre>
+<h4>decodeName</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;decodeName(java.lang.String&nbsp;pathName)</pre>
 <div class="block">Un-escapes a name.</div>
 </li>
 </ul>
@@ -264,6 +307,44 @@ <h4>decodePath</h4>
 <div class="block">Splits the path and decodes each individual name.</div>
 </li>
 </ul>
+<a name="encodePath-boolean-java.lang.String...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>encodePath</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;encodePath(boolean&nbsp;leadingSlash,
+                                          java.lang.String...&nbsp;names)</pre>
+<div class="block">Creates a properly encoded path from the given names.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>leadingSlash</code> - Whether or not to prepend a slash to the path.</dd>
+<dd><code>names</code> - The names to encode in the given order.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A properly encoded path name.</dd>
+</dl>
+</li>
+</ul>
+<a name="encodePath-boolean-java.lang.String:A-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>encodePath</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;encodePath(boolean&nbsp;leadingSlash,
+                                          java.lang.String[]&nbsp;names,
+                                          int&nbsp;len)</pre>
+<div class="block">Creates a properly encoded path from the given names.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>leadingSlash</code> - Whether or not to prepend a slash to the path.</dd>
+<dd><code>names</code> - The names to encode in the given order.</dd>
+<dd><code>len</code> - The number of elements from the names array to use start at index 0.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>A properly encoded path name.</dd>
+</dl>
+</li>
+</ul>
 <a name="encodePath-org.iot.dsa.node.DSNode-">
 <!--   -->
 </a>
@@ -303,6 +384,21 @@ <h4>encodeName</h4>
 </dl>
 </li>
 </ul>
+<a name="encodeNameV1-java.lang.String-java.lang.StringBuilder-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>encodeNameV1</h4>
+<pre>public static&nbsp;boolean&nbsp;encodeNameV1(java.lang.String&nbsp;name,
+                                   java.lang.StringBuilder&nbsp;buf)</pre>
+<div class="block">Encodes a DSA v1 name for use outside of a path.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>True if the name was modified in any way.</dd>
+</dl>
+</li>
+</ul>
 <a name="getLastPathElement--">
 <!--   -->
 </a>
@@ -332,16 +428,6 @@ <h4>getPathElements</h4>
 <div class="block">The individual, decoded path elements.</div>
 </li>
 </ul>
-<a name="shouldEncode-int-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>shouldEncode</h4>
-<pre>public static&nbsp;boolean&nbsp;shouldEncode(int&nbsp;ch)</pre>
-<div class="block">Returns true for characters that should be encoded.</div>
-</li>
-</ul>
 <a name="splitPath-java.lang.String-">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSRegistry.html b/docs/javadoc/org/iot/dsa/node/DSRegistry.html
index 0d9f2072..7f4134da 100644
--- a/docs/javadoc/org/iot/dsa/node/DSRegistry.html
+++ b/docs/javadoc/org/iot/dsa/node/DSRegistry.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSRegistry (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSRegistry (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSRegistry (dslink-core 0.11.0 API)";
+            parent.document.title="DSRegistry (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/DSStatus.html b/docs/javadoc/org/iot/dsa/node/DSStatus.html
index 487e1d57..fd40dfe8 100644
--- a/docs/javadoc/org/iot/dsa/node/DSStatus.html
+++ b/docs/javadoc/org/iot/dsa/node/DSStatus.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSStatus (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSStatus (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSStatus (dslink-core 0.11.0 API)";
+            parent.document.title="DSStatus (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -113,13 +113,13 @@ <h2 title="Class DSStatus" class="title">Class DSStatus</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSStatus</span>
 extends <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>
-implements <a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a></pre>
+implements <a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></pre>
 <div class="block">Represent the health, quality or condition of an object.
 
  <p>
@@ -536,13 +536,14 @@ <h3>Method Summary</h3>
 <tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSStatus.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 </td>
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSStatus.html#store--">store</a></span>()</code>
-<div class="block">Calls toElement()</div>
+<div class="block">Serialize the value for the configuration database.</div>
 </td>
 </tr>
 <tr id="i24" class="altColor">
@@ -1401,13 +1402,12 @@ <h4>isUnknown</h4>
 <li class="blockList">
 <h4>store</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSLong.html" title="class in org.iot.dsa.node">DSLong</a>&nbsp;store()</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#store--">DSValue</a></code></span></div>
-<div class="block">Calls toElement()</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">DSIStorable</a></code></span></div>
+<div class="block">Serialize the value for the configuration database.  Can be a different element type than
+ toElement().</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -1418,13 +1418,12 @@ <h4>store</h4>
 <li class="blockList">
 <h4>restore</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node">DSStatus</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">DSValue</a></code></span></div>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">DSIStorable</a></code></span></div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/node/DSString.html b/docs/javadoc/org/iot/dsa/node/DSString.html
index 4067b24f..8981c199 100644
--- a/docs/javadoc/org/iot/dsa/node/DSString.html
+++ b/docs/javadoc/org/iot/dsa/node/DSString.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSString (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSString (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSString (dslink-core 0.11.0 API)";
+            parent.document.title="DSString (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -231,13 +231,6 @@ <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/
 <code><a href="../../../../org/iot/dsa/node/DSElement.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBoolean--">isBoolean</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isBytes--">isBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isDouble--">isDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isFloat--">isFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isGroup--">isGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isInt--">isInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isList--">isList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isLong--">isLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isMap--">isMap</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#isNumber--">isNumber</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-boolean-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-byte:A-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-double-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-int-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-long-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#make-java.lang.String-">make</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#makeNull--">makeNull</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toBytes--">toBytes</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toDouble--">toDouble</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toFloat--">toFloat</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toGroup--">toGroup</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toInt--">toInt</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toList--">toList</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toLong--">toLong</a>, <a href="../../../../org/iot/dsa/node/DSElement.html#toMap--">toMap</a></code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSValue">
-<!--   -->
-</a>
-<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/node/DSValue.html b/docs/javadoc/org/iot/dsa/node/DSValue.html
index b4a5cf82..9e35e64e 100644
--- a/docs/javadoc/org/iot/dsa/node/DSValue.html
+++ b/docs/javadoc/org/iot/dsa/node/DSValue.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSValue (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSValue (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSValue (dslink-core 0.11.0 API)";
+            parent.document.title="DSValue (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var methods = {"i0":10,"i1":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/node/DSValue.html" target="_top">Frames</a></li>
@@ -162,18 +162,6 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
-<div class="block">Calls valueOf(arg).</div>
-</td>
-</tr>
-<tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></span>()</code>
-<div class="block">Calls toElement()</div>
-</td>
-</tr>
-<tr id="i3" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValue.html#toString--">toString</a></span>()</code>
 <div class="block">If isNull(), returns "null", otherwise returns toElement().toString()</div>
@@ -246,34 +234,6 @@ <h4>copy</h4>
 </dl>
 </li>
 </ul>
-<a name="restore-org.iot.dsa.node.DSElement-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>restore</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</pre>
-<div class="block">Calls valueOf(arg).</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-</dl>
-</li>
-</ul>
-<a name="store--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>store</h4>
-<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;store()</pre>
-<div class="block">Calls toElement()</div>
-<dl>
-<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-</dl>
-</li>
-</ul>
 <a name="toString--">
 <!--   -->
 </a>
@@ -316,7 +276,7 @@ <h4>toString</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../index.html?org/iot/dsa/node/DSValue.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/DSValueNode.html b/docs/javadoc/org/iot/dsa/node/DSValueNode.html
new file mode 100644
index 00000000..61a8411a
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/DSValueNode.html
@@ -0,0 +1,470 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSValueNode (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSValueNode (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/node/DSValueNode.html" target="_top">Frames</a></li>
+<li><a href="DSValueNode.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node</div>
+<h2 title="Class DSValueNode" class="title">Class DSValueNode</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">org.iot.dsa.logging.DSLogger</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">org.iot.dsa.node.DSNode</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.DSValueNode</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.lang.Iterable&lt;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&gt;, <a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public abstract class <span class="typeNameLabel">DSValueNode</span>
+extends <a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>
+implements <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></pre>
+<div class="block">A convenience implementation of a node that is also a value.  The value of the node must be
+ stored as a child.  Subclasses only need to override is getValueChild()</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/iot/dsa/node/DSValueNode.html#getValueChild--"><code>getValueChild()</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Fields inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC">INFO_TOPIC</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC">VALUE_TOPIC</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="fields.inherited.from.class.org.iot.dsa.logging.DSILevels">
+<!--   -->
+</a>
+<h3>Fields inherited from interface&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSILevels.html#admin">admin</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ADMIN">ADMIN</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#all">all</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#CONFIG">CONFIG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#debug">debug</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#DEBUG">DEBUG</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#error">error</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#ERROR">ERROR</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fatal">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FATAL">FATAL</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#fine">fine</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#FINE">FINE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#info">info</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#INFO">INFO</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#off">off</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#trace">trace</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#TRACE">TRACE</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#warn">warn</a>, <a href="../../../../org/iot/dsa/logging/DSILevels.html#WARN">WARN</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#DSValueNode--">DSValueNode</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>abstract <a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#getValueChild--">getValueChild</a></span>()</code>
+<div class="block">Subclasses must store the node value in a child value and provide the info for that child
+ here.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#getValueType--">getValueType</a></span>()</code>
+<div class="block">The DSA type mapping.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a></span>(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</code>
+<div class="block">This fires the NODE_CHANGED topic when the value child changes.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a></span>(<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</code>
+<div class="block">Override point, called only when a DSNode subclass implements DSIValue is being set.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#toElement--">toElement</a></span>()</code>
+<div class="block">The current value should convert itself to an element for DSA interop such as subscription
+ updates, and setting requests.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/node/DSValueNode.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</code>
+<div class="block">This should convert an element transmitted over DSA, such as subscription updates or set
+ requests.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSNode">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSNode.html#add-java.lang.String-org.iot.dsa.node.DSIObject-">add</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#childCount--">childCount</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#clear--">clear</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#contains-java.lang.String-">contains</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefault-java.lang.String-org.iot.dsa.node.DSIObject-">declareDefault</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#declareDefaults--">declareDefaults</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#fire-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSInfo-java.lang.Object...-">fire</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#get-java.lang.String-">get</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getElement-java.lang.String-">getElement</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirst--">getFirst</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstInfo--">getFirstInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getFirstNodeInfo--">getFirstNodeInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo--">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getInfo-java.lang.String-">getInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLast--">getLast</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLastInfo--">getLastInfo</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getLogName--">getLogName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getMetadata-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">getMetadata</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getName--">getName</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getNode-java.lang.String-">getNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getParent--">getParent</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getPath--">getPath</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#getValue-java.lang.String-">getValue</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isDefaultInstance--">isDefaultInstance</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isIdentical-java.lang.Object-">isIdentical</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNode-java.lang.Object-">isNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isRunning--">isRunning</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStable--">isStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStarted--">isStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isStopped--">isStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed--">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#isSubscribed-org.iot.dsa.node.event.DSTopic-">isSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateNodes--">iterateNodes</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterateValues--">iterateValues</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#iterator--">iterator</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildAdded-org.iot.dsa.node.DSInfo-">onChildAdded</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onChildRemoved-org.iot.dsa.node.DSInfo-">onChildRemoved</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInfoChanged-org.iot.dsa.node.DSInfo-">onInfoChanged</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onInvoke-org.iot.dsa.node.DSInfo-org.iot.dsa.node.action.ActionInvocation-">onInvoke</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIValue-">onSet</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStable--">onStable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStarted--">onStarted</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onStopped--">onStopped</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onSubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed--">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onSubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onSubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">onUnsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed--">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-">onUnsubscribed</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-boolean-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-double-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-org.iot.dsa.node.DSIObject-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-float-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-int-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-long-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#put-java.lang.String-java.lang.String-">put</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-org.iot.dsa.node.DSInfo-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#remove-java.lang.String-">remove</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stable--">stable</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#start--">start</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#stop--">stop</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">subscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#toNode-java.lang.Object-">toNode</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#unsubscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-">unsubscribe</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateChild-org.iot.dsa.node.DSIObject-">validateChild</a>, <a href="../../../../org/iot/dsa/node/DSNode.html#validateParent-org.iot.dsa.node.DSNode-">validateParent</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.logging.DSLogger">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging">DSLogger</a></h3>
+<code><a href="../../../../org/iot/dsa/logging/DSLogger.html#admin--">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#admin-java.lang.Object-java.lang.Throwable-">admin</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug--">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#debug-java.lang.Object-java.lang.Throwable-">debug</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error--">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#error-java.lang.Object-java.lang.Throwable-">error</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal--">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fatal-java.lang.Object-java.lang.Throwable-">fatal</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine--">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#fine-java.lang.Object-java.lang.Throwable-">fine</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info--">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#info-java.lang.Object-java.lang.Throwable-">info</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace--">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#trace-java.lang.Object-java.lang.Throwable-">trace</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn--">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-">warn</a>, <a href="../../../../org/iot/dsa/logging/DSLogger.html#warn-java.lang.Object-java.lang.Throwable-">warn</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIValue">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSIValue.html#isNull--">isNull</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIObject">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></h3>
+<code><a href="../../../../org/iot/dsa/node/DSIObject.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSIObject.html#isEqual-java.lang.Object-">isEqual</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Iterable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;java.lang.Iterable</h3>
+<code>forEach, spliterator</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="DSValueNode--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DSValueNode</h4>
+<pre>public&nbsp;DSValueNode()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="onChildChanged-org.iot.dsa.node.DSInfo-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onChildChanged</h4>
+<pre>public&nbsp;void&nbsp;onChildChanged(<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</pre>
+<div class="block">This fires the NODE_CHANGED topic when the value child changes.  Overrides should call
+ super.onChildChanged.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#onChildChanged-org.iot.dsa.node.DSInfo-">onChildChanged</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValueType--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValueType</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a>&nbsp;getValueType()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html#getValueType--">DSIValue</a></code></span></div>
+<div class="block">The DSA type mapping.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#getValueType--">getValueType</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValueChild--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValueChild</h4>
+<pre>public abstract&nbsp;<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;getValueChild()</pre>
+<div class="block">Subclasses must store the node value in a child value and provide the info for that child
+ here.  This method will be called often, it would be best to cache the info instance
+ rather then doing a name lookup each time.</div>
+</li>
+</ul>
+<a name="toElement--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toElement</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;toElement()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html#toElement--">DSIValue</a></code></span></div>
+<div class="block">The current value should convert itself to an element for DSA interop such as subscription
+ updates, and setting requests.  This is not for configuration database serialization.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#toElement--">toElement</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="onSet-org.iot.dsa.node.DSIValue-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onSet</h4>
+<pre>public&nbsp;void&nbsp;onSet(<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">DSNode</a></code></span></div>
+<div class="block">Override point, called only when a DSNode subclass implements DSIValue is being set.  This
+ will throw and IllegalStateException if not overridden. You should store the value of the
+ node as a child and call put in override implementation.  Throw an exception to
+ report an error to the requester.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSNode.html#onSet-org.iot.dsa.node.DSIValue-">onSet</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>value</code> - The new value.</dd>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../org/iot/dsa/dslink/DSIResponder.html#onSet-org.iot.dsa.dslink.responder.InboundSetRequest-"><code>DSIResponder.onSet(InboundSetRequest)</code></a>, 
+<a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><code>DSValueNode</code></a></dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-org.iot.dsa.node.DSElement-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;valueOf(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html#valueOf-org.iot.dsa.node.DSElement-">DSIValue</a></code></span></div>
+<div class="block">This should convert an element transmitted over DSA, such as subscription updates or set
+ requests.  This is not for configuration database deserialization.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/iot/dsa/node/DSValueNode.html" target="_top">Frames</a></li>
+<li><a href="DSValueNode.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#fields.inherited.from.class.org.iot.dsa.node.DSNode">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/DSValueType.html b/docs/javadoc/org/iot/dsa/node/DSValueType.html
index 5fdb8037..791c99c7 100644
--- a/docs/javadoc/org/iot/dsa/node/DSValueType.html
+++ b/docs/javadoc/org/iot/dsa/node/DSValueType.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSValueType (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSValueType (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSValueType (dslink-core 0.11.0 API)";
+            parent.document.title="DSValueType (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -48,7 +48,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -385,7 +385,7 @@ <h4>toString</h4>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/node/action/ActionInvocation.html b/docs/javadoc/org/iot/dsa/node/action/ActionInvocation.html
index ac34c096..69d900e3 100644
--- a/docs/javadoc/org/iot/dsa/node/action/ActionInvocation.html
+++ b/docs/javadoc/org/iot/dsa/node/action/ActionInvocation.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>ActionInvocation (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>ActionInvocation (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActionInvocation (dslink-core 0.11.0 API)";
+            parent.document.title="ActionInvocation (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/action/ActionResult.html b/docs/javadoc/org/iot/dsa/node/action/ActionResult.html
index 35aa9615..c8e40298 100644
--- a/docs/javadoc/org/iot/dsa/node/action/ActionResult.html
+++ b/docs/javadoc/org/iot/dsa/node/action/ActionResult.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>ActionResult (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>ActionResult (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActionResult (dslink-core 0.11.0 API)";
+            parent.document.title="ActionResult (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -102,6 +102,10 @@ <h2 title="Interface ActionResult" class="title">Interface ActionResult</h2>
 <dt>All Known Subinterfaces:</dt>
 <dd><a href="../../../../../org/iot/dsa/node/action/ActionTable.html" title="interface in org.iot.dsa.node.action">ActionTable</a>, <a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a></dd>
 </dl>
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">ActionResult</span></pre>
diff --git a/docs/javadoc/org/iot/dsa/node/action/ActionSpec.ResultType.html b/docs/javadoc/org/iot/dsa/node/action/ActionSpec.ResultType.html
index b7f9e1eb..607bf3ba 100644
--- a/docs/javadoc/org/iot/dsa/node/action/ActionSpec.ResultType.html
+++ b/docs/javadoc/org/iot/dsa/node/action/ActionSpec.ResultType.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>ActionSpec.ResultType (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>ActionSpec.ResultType (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActionSpec.ResultType (dslink-core 0.11.0 API)";
+            parent.document.title="ActionSpec.ResultType (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/action/ActionSpec.html b/docs/javadoc/org/iot/dsa/node/action/ActionSpec.html
index d08119e9..ed56d244 100644
--- a/docs/javadoc/org/iot/dsa/node/action/ActionSpec.html
+++ b/docs/javadoc/org/iot/dsa/node/action/ActionSpec.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>ActionSpec (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>ActionSpec (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActionSpec (dslink-core 0.11.0 API)";
+            parent.document.title="ActionSpec (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/action/ActionTable.html b/docs/javadoc/org/iot/dsa/node/action/ActionTable.html
index f40af680..8d2b5bc2 100644
--- a/docs/javadoc/org/iot/dsa/node/action/ActionTable.html
+++ b/docs/javadoc/org/iot/dsa/node/action/ActionTable.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>ActionTable (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>ActionTable (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActionTable (dslink-core 0.11.0 API)";
+            parent.document.title="ActionTable (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/node/action/ActionValues.html b/docs/javadoc/org/iot/dsa/node/action/ActionValues.html
index 0ac1a5c7..131e81d0 100644
--- a/docs/javadoc/org/iot/dsa/node/action/ActionValues.html
+++ b/docs/javadoc/org/iot/dsa/node/action/ActionValues.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>ActionValues (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>ActionValues (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ActionValues (dslink-core 0.11.0 API)";
+            parent.document.title="ActionValues (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -102,6 +102,10 @@ <h2 title="Interface ActionValues" class="title">Interface ActionValues</h2>
 <dt>All Superinterfaces:</dt>
 <dd><a href="../../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></dd>
 </dl>
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></dd>
+</dl>
 <hr>
 <br>
 <pre>public interface <span class="typeNameLabel">ActionValues</span>
diff --git a/docs/javadoc/org/iot/dsa/node/action/DSAction.html b/docs/javadoc/org/iot/dsa/node/action/DSAction.html
index 4e0bf941..4aef4e45 100644
--- a/docs/javadoc/org/iot/dsa/node/action/DSAction.html
+++ b/docs/javadoc/org/iot/dsa/node/action/DSAction.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSAction (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSAction (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSAction (dslink-core 0.11.0 API)";
+            parent.document.title="DSAction (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -49,7 +49,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/node/action/DSAction.html" target="_top">Frames</a></li>
@@ -296,12 +296,19 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSAction.html#prepareParameter-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">prepareParameter</a></span>(<a href="../../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
+                <a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;parameter)</code>
+<div class="block">Override point, called for each parameter as it is being sent to the requester.</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSAction.html#setPermission-org.iot.dsa.security.DSPermission-">setPermission</a></span>(<a href="../../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a>&nbsp;permission)</code>
 <div class="block">Returns this, it is not necessary to set the permission to read.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSAction.html#setResultType-org.iot.dsa.node.action.ActionSpec.ResultType-">setResultType</a></span>(<a href="../../../../../org/iot/dsa/node/action/ActionSpec.ResultType.html" title="enum in org.iot.dsa.node.action">ActionSpec.ResultType</a>&nbsp;result)</code>
 <div class="block">Returns this, it is not necessary to set the result to void.</div>
@@ -632,6 +639,24 @@ <h4>isNull</h4>
 </dl>
 </li>
 </ul>
+<a name="prepareParameter-org.iot.dsa.node.DSInfo-org.iot.dsa.node.DSMap-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>prepareParameter</h4>
+<pre>public&nbsp;void&nbsp;prepareParameter(<a href="../../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;info,
+                             <a href="../../../../../org/iot/dsa/node/DSMap.html" title="class in org.iot.dsa.node">DSMap</a>&nbsp;parameter)</pre>
+<div class="block">Override point, called for each parameter as it is being sent to the requester.  Allows you
+ for example, to use current values as defaults.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>info</code> - The info about the action in it's parent container.  Never use the outer
+                  'this' of anonymous instances.</dd>
+<dd><code>parameter</code> - Map representing a single parameter.</dd>
+</dl>
+</li>
+</ul>
 <a name="setPermission-org.iot.dsa.security.DSPermission-">
 <!--   -->
 </a>
@@ -680,7 +705,7 @@ <h4>setResultType</h4>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li>Next&nbsp;Class</li>
+<li><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/node/action/DSAction.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/action/DSActionValues.html b/docs/javadoc/org/iot/dsa/node/action/DSActionValues.html
new file mode 100644
index 00000000..50a5089b
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/action/DSActionValues.html
@@ -0,0 +1,338 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSActionValues (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSActionValues (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/action/DSActionValues.html" target="_top">Frames</a></li>
+<li><a href="DSActionValues.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.action</div>
+<h2 title="Class DSActionValues" class="title">Class DSActionValues</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.action.DSActionValues</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a>, <a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSActionValues</span>
+extends java.lang.Object
+implements <a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a></pre>
+<div class="block">This is a convenience implementation of ActionValues.  It is for actions that return one or
+ more values (not tables or streams).</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html#DSActionValues-org.iot.dsa.node.action.DSAction-">DSActionValues</a></span>(<a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a>&nbsp;action)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html#addResult-org.iot.dsa.node.DSIValue-">addResult</a></span>(<a href="../../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</code>
+<div class="block">Values must be added in the same order they were defined in the action.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html#getAction--">getAction</a></span>()</code>
+<div class="block">The action that was invoked.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.util.Iterator&lt;<a href="../../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html#getValues--">getValues</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html#onClose--">onClose</a></span>()</code>
+<div class="block">Does nothing.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="DSActionValues-org.iot.dsa.node.action.DSAction-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DSActionValues</h4>
+<pre>public&nbsp;DSActionValues(<a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a>&nbsp;action)</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="addResult-org.iot.dsa.node.DSIValue-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addResult</h4>
+<pre>public&nbsp;<a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a>&nbsp;addResult(<a href="../../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&nbsp;value)</pre>
+<div class="block">Values must be added in the same order they were defined in the action.</div>
+</li>
+</ul>
+<a name="getAction--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAction</h4>
+<pre>public&nbsp;<a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action">DSAction</a>&nbsp;getAction()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/iot/dsa/node/action/ActionResult.html#getAction--">ActionResult</a></code></span></div>
+<div class="block">The action that was invoked.  This is needed for custom DSResponder implementations where the
+ action is unknown.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../org/iot/dsa/node/action/ActionResult.html#getAction--">getAction</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getValues--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getValues</h4>
+<pre>public&nbsp;java.util.Iterator&lt;<a href="../../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>&gt;&nbsp;getValues()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../org/iot/dsa/node/action/ActionValues.html#getValues--">getValues</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="onClose--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>onClose</h4>
+<pre>public&nbsp;void&nbsp;onClose()</pre>
+<div class="block">Does nothing.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../org/iot/dsa/node/action/ActionResult.html#onClose--">onClose</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/node/action/ActionResult.html" title="interface in org.iot.dsa.node.action">ActionResult</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/action/DSActionValues.html" target="_top">Frames</a></li>
+<li><a href="DSActionValues.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/action/package-frame.html b/docs/javadoc/org/iot/dsa/node/action/package-frame.html
index bfe39ff6..00a8db1d 100644
--- a/docs/javadoc/org/iot/dsa/node/action/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/node/action/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.node.action (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node.action (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -22,6 +22,7 @@ <h2 title="Interfaces">Interfaces</h2>
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
 <li><a href="DSAction.html" title="class in org.iot.dsa.node.action" target="classFrame">DSAction</a></li>
+<li><a href="DSActionValues.html" title="class in org.iot.dsa.node.action" target="classFrame">DSActionValues</a></li>
 </ul>
 <h2 title="Enums">Enums</h2>
 <ul title="Enums">
diff --git a/docs/javadoc/org/iot/dsa/node/action/package-summary.html b/docs/javadoc/org/iot/dsa/node/action/package-summary.html
index 1593b147..c1cf353f 100644
--- a/docs/javadoc/org/iot/dsa/node/action/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/node/action/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.node.action (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node.action (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.node.action (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.node.action (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/node/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/iot/dsa/security/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/node/action/package-summary.html" target="_top">Frames</a></li>
@@ -129,6 +129,12 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node.action</h1>
 <div class="block">Fully describes an action and routes invocations to DSNode.onInvoke.</div>
 </td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action">DSActionValues</a></td>
+<td class="colLast">
+<div class="block">This is a convenience implementation of ActionValues.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -172,7 +178,7 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node.action</h1>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/node/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/iot/dsa/security/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/node/action/package-summary.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/action/package-tree.html b/docs/javadoc/org/iot/dsa/node/action/package-tree.html
index 7e537356..1ecac076 100644
--- a/docs/javadoc/org/iot/dsa/node/action/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/node/action/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.node.action Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node.action Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.node.action Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.node.action Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -43,7 +43,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/node/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/iot/dsa/security/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/node/action/package-tree.html" target="_top">Frames</a></li>
@@ -81,6 +81,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">java.lang.Object
 <ul>
 <li type="circle">org.iot.dsa.node.action.<a href="../../../../../org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">DSAction</span></a> (implements org.iot.dsa.node.action.<a href="../../../../../org/iot/dsa/node/action/ActionSpec.html" title="interface in org.iot.dsa.node.action">ActionSpec</a>, org.iot.dsa.node.<a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>)</li>
+<li type="circle">org.iot.dsa.node.action.<a href="../../../../../org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">DSActionValues</span></a> (implements org.iot.dsa.node.action.<a href="../../../../../org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a>)</li>
 </ul>
 </li>
 </ul>
@@ -129,7 +130,7 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/iot/dsa/node/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/iot/dsa/security/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/iot/dsa/node/action/package-tree.html" target="_top">Frames</a></li>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSIEvent.html b/docs/javadoc/org/iot/dsa/node/event/DSIEvent.html
new file mode 100644
index 00000000..7cf25e6c
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSIEvent.html
@@ -0,0 +1,175 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSIEvent (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSIEvent (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSIEvent.html" target="_top">Frames</a></li>
+<li><a href="DSIEvent.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Interface DSIEvent" class="title">Interface DSIEvent</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>, <a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a>, <a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">DSIEvent</span></pre>
+<div class="block">This is an empty interface, DSTopics are allowed to define events however they wish.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html#onEvent-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-java.lang.Object...-"><code>DSISubscriber.onEvent(DSTopic, DSIEvent, DSNode, DSInfo, Object...)</code></a>, 
+<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><code>DSTopic</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev&nbsp;Class</li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSIEvent.html" target="_top">Frames</a></li>
+<li><a href="DSIEvent.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSISubscriber.html b/docs/javadoc/org/iot/dsa/node/event/DSISubscriber.html
new file mode 100644
index 00000000..41e38532
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSISubscriber.html
@@ -0,0 +1,283 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSISubscriber (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSISubscriber (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSISubscriber.html" target="_top">Frames</a></li>
+<li><a href="DSISubscriber.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Interface DSISubscriber" class="title">Interface DSISubscriber</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="typeNameLabel">DSISubscriber</span></pre>
+<div class="block">DSISubscribers subscribe to DSTopics on DSNodes.
+ <p>
+ A single topic can emanate multiple types of events.  The event object is an empty interface,
+ each topic will define it's own events.
+ <p>
+ Events can also supply parameters.  The parameters specific to each kind of event.
+ <p>
+ See the class documentation of a specific topic to understand the possible events and their
+ parameters.
+ <p>
+ The two most important topics are built into every node, they are: DSValueTopic and DSInfoTopic.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><code>DSIEvent</code></a>, 
+<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><code>DSTopic</code></a>, 
+<a href="../../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-"><code>DSNode.subscribe(DSTopic, DSInfo, DSISubscriber)</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html#onEvent-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-java.lang.Object...-">onEvent</a></span>(<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+       <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>&nbsp;event,
+       <a href="../../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node,
+       <a href="../../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+       java.lang.Object...&nbsp;params)</code>
+<div class="block">Subscription callback.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html#onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-">onUnsubscribed</a></span>(<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+              <a href="../../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node,
+              <a href="../../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</code>
+<div class="block">Called no matter how the unsubscribe happens, whether explicitly or if the node
+ unsubscribes itself.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="onEvent-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.event.DSIEvent-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-java.lang.Object...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>onEvent</h4>
+<pre>void&nbsp;onEvent(<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+             <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>&nbsp;event,
+             <a href="../../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node,
+             <a href="../../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child,
+             java.lang.Object...&nbsp;params)</pre>
+<div class="block">Subscription callback.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - Required, the topic emanating the event.</dd>
+<dd><code>event</code> - Required, the actual event.</dd>
+<dd><code>node</code> - Required, node subscribed to.</dd>
+<dd><code>child</code> - Optional, if the event concerns a child.</dd>
+<dd><code>params</code> - Can be null, only used if the event defines it.</dd>
+</dl>
+</li>
+</ul>
+<a name="onUnsubscribed-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSNode-org.iot.dsa.node.DSInfo-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>onUnsubscribed</h4>
+<pre>void&nbsp;onUnsubscribed(<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;topic,
+                    <a href="../../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a>&nbsp;node,
+                    <a href="../../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node">DSInfo</a>&nbsp;child)</pre>
+<div class="block">Called no matter how the unsubscribe happens, whether explicitly or if the node
+ unsubscribes itself.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>topic</code> - The topic that was passed to DSNode.subscribe.</dd>
+<dd><code>node</code> - Node that was passed to DSNode.subscribe, never null.</dd>
+<dd><code>child</code> - The child that was passed to DSNode.subscribe, may be null.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSISubscriber.html" target="_top">Frames</a></li>
+<li><a href="DSISubscriber.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSInfoTopic.Event.html b/docs/javadoc/org/iot/dsa/node/event/DSInfoTopic.Event.html
new file mode 100644
index 00000000..d8f554f7
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSInfoTopic.Event.html
@@ -0,0 +1,366 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSInfoTopic.Event (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSInfoTopic.Event (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSInfoTopic.Event.html" target="_top">Frames</a></li>
+<li><a href="DSInfoTopic.Event.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Enum DSInfoTopic.Event" class="title">Enum DSInfoTopic.Event</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Enum&lt;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.event.DSInfoTopic.Event</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>&gt;, <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static enum <span class="typeNameLabel">DSInfoTopic.Event</span>
+extends java.lang.Enum&lt;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>&gt;
+implements <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></pre>
+<div class="block">The possible events for this topic.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html#CHILD_ADDED">CHILD_ADDED</a></span></code>
+<div class="block">Events will have a single parameter, the info of the new child.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html#CHILD_REMOVED">CHILD_REMOVED</a></span></code>
+<div class="block">Events will have a single parameter, the unparented info of the child.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html#METADATA_CHANGED">METADATA_CHANGED</a></span></code>
+<div class="block">TBD.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
+<code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="CHILD_ADDED">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CHILD_ADDED</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a> CHILD_ADDED</pre>
+<div class="block">Events will have a single parameter, the info of the new child.</div>
+</li>
+</ul>
+<a name="CHILD_REMOVED">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CHILD_REMOVED</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a> CHILD_REMOVED</pre>
+<div class="block">Events will have a single parameter, the unparented info of the child.</div>
+</li>
+</ul>
+<a name="METADATA_CHANGED">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>METADATA_CHANGED</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a> METADATA_CHANGED</pre>
+<div class="block">TBD. Node? Child? Both?</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (DSInfoTopic.Event c : DSInfoTopic.Event.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSInfoTopic.Event.html" target="_top">Frames</a></li>
+<li><a href="DSInfoTopic.Event.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSInfoTopic.html b/docs/javadoc/org/iot/dsa/node/event/DSInfoTopic.html
new file mode 100644
index 00000000..70808327
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSInfoTopic.html
@@ -0,0 +1,285 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSInfoTopic (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSInfoTopic (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSInfoTopic.html" target="_top">Frames</a></li>
+<li><a href="DSInfoTopic.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.iot.dsa.node.event.DSTopic">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Class DSInfoTopic" class="title">Class DSInfoTopic</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">org.iot.dsa.node.event.DSTopic</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.event.DSInfoTopic</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSInfoTopic</span>
+extends <a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></pre>
+<div class="block">This topic is for info related events on DSNodes.
+ <p>
+ Events will be on of the enum defined in the Event inner class.  The parameters for each event
+ are defined in the documentation for each event.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a></span></code>
+<div class="block">The possible events for this topic.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance of this topic.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.event.DSTopic">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></h3>
+<code><a href="../../../../../org/iot/dsa/node/event/DSTopic.html#copy--">copy</a>, <a href="../../../../../org/iot/dsa/node/event/DSTopic.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../../org/iot/dsa/node/event/DSTopic.html#isNull--">isNull</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a> INSTANCE</pre>
+<div class="block">The only instance of this topic.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/iot/dsa/node/DSNode.html#INFO_TOPIC"><code>DSNode.INFO_TOPIC</code></a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSInfoTopic.html" target="_top">Frames</a></li>
+<li><a href="DSInfoTopic.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.iot.dsa.node.event.DSTopic">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSTopic.html b/docs/javadoc/org/iot/dsa/node/event/DSTopic.html
new file mode 100644
index 00000000..9f1f8d01
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSTopic.html
@@ -0,0 +1,344 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSTopic (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSTopic (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":10,"i1":10,"i2":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSTopic.html" target="_top">Frames</a></li>
+<li><a href="DSTopic.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Class DSTopic" class="title">Class DSTopic</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.event.DSTopic</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></dd>
+</dl>
+<dl>
+<dt>Direct Known Subclasses:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a>, <a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSTopic</span>
+extends java.lang.Object
+implements <a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></pre>
+<div class="block">DSISubscribers subscribe to DSTopics on DSNodes.
+ <p>
+ A single topic can emanate multiple types of events.  The event object is an empty interface,
+ each topic will define it's own events.
+ <p>
+ Events can also supply parameters.  The parameters specific to each kind of event.
+ <p>
+ See the class documentation of a specific topic to understand the possible events and their
+ parameters.
+ <p>
+ The two most important topics are built into every node, they are: DSValueTopic and DSInfoTopic.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><code>DSIEvent</code></a>, 
+<a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><code>DSISubscriber</code></a>, 
+<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><code>DSInfoTopic</code></a>, 
+<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><code>DSValueTopic</code></a>, 
+<a href="../../../../../org/iot/dsa/node/DSNode.html#subscribe-org.iot.dsa.node.event.DSTopic-org.iot.dsa.node.DSInfo-org.iot.dsa.node.event.DSISubscriber-"><code>DSNode.subscribe(DSTopic, DSInfo, DSISubscriber)</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSTopic.html#DSTopic--">DSTopic</a></span>()</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSTopic.html#copy--">copy</a></span>()</code>
+<div class="block">Returns this.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSTopic.html#isEqual-java.lang.Object-">isEqual</a></span>(java.lang.Object&nbsp;obj)</code>
+<div class="block">Only test instance equality.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSTopic.html#isNull--">isNull</a></span>()</code>
+<div class="block">False</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="DSTopic--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DSTopic</h4>
+<pre>public&nbsp;DSTopic()</pre>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="copy--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>copy</h4>
+<pre>public&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>&nbsp;copy()</pre>
+<div class="block">Returns this.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../org/iot/dsa/node/DSIObject.html#copy--">copy</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isEqual-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isEqual</h4>
+<pre>public&nbsp;boolean&nbsp;isEqual(java.lang.Object&nbsp;obj)</pre>
+<div class="block">Only test instance equality.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../org/iot/dsa/node/DSIObject.html#isEqual-java.lang.Object-">isEqual</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="isNull--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>isNull</h4>
+<pre>public&nbsp;boolean&nbsp;isNull()</pre>
+<div class="block">False</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../org/iot/dsa/node/DSIObject.html#isNull--">isNull</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSTopic.html" target="_top">Frames</a></li>
+<li><a href="DSTopic.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSValueTopic.Event.html b/docs/javadoc/org/iot/dsa/node/event/DSValueTopic.Event.html
new file mode 100644
index 00000000..b9a80b9d
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSValueTopic.Event.html
@@ -0,0 +1,351 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSValueTopic.Event (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSValueTopic.Event (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+var methods = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSValueTopic.Event.html" target="_top">Frames</a></li>
+<li><a href="DSValueTopic.Event.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Enum DSValueTopic.Event" class="title">Enum DSValueTopic.Event</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>java.lang.Enum&lt;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a>&gt;</li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.event.DSValueTopic.Event</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd>java.io.Serializable, java.lang.Comparable&lt;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a>&gt;, <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static enum <span class="typeNameLabel">DSValueTopic.Event</span>
+extends java.lang.Enum&lt;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a>&gt;
+implements <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></pre>
+<div class="block">The possible events from this topic.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.summary">
+<!--   -->
+</a>
+<h3>Enum Constant Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Enum Constant and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html#CHILD_CHANGED">CHILD_CHANGED</a></span></code>
+<div class="block">For node value children (who are not also nodes).</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html#NODE_CHANGED">NODE_CHANGED</a></span></code>
+<div class="block">For DSNodes that implement DSIValue.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html#values--">values</a></span>()</code>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Enum">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Enum</h3>
+<code>clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>getClass, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="enum.constant.detail">
+<!--   -->
+</a>
+<h3>Enum Constant Detail</h3>
+<a name="NODE_CHANGED">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>NODE_CHANGED</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a> NODE_CHANGED</pre>
+<div class="block">For DSNodes that implement DSIValue.  The DSInfo arg to onEvent must be null.</div>
+</li>
+</ul>
+<a name="CHILD_CHANGED">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CHILD_CHANGED</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a> CHILD_CHANGED</pre>
+<div class="block">For node value children (who are not also nodes).  The DSInfo arg must not be null.</div>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="values--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>values</h4>
+<pre>public static&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a>[]&nbsp;values()</pre>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.  This method may be used to iterate
+over the constants as follows:
+<pre>
+for (DSValueTopic.Event c : DSValueTopic.Event.values())
+&nbsp;   System.out.println(c);
+</pre></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an array containing the constants of this enum type, in the order they are declared</dd>
+</dl>
+</li>
+</ul>
+<a name="valueOf-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a>&nbsp;valueOf(java.lang.String&nbsp;name)</pre>
+<div class="block">Returns the enum constant of this type with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this type.  (Extraneous whitespace characters are 
+not permitted.)</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the enum constant with the specified name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
+<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li>Next&nbsp;Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSValueTopic.Event.html" target="_top">Frames</a></li>
+<li><a href="DSValueTopic.Event.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li><a href="#enum.constant.summary">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#enum.constant.detail">Enum Constants</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/DSValueTopic.html b/docs/javadoc/org/iot/dsa/node/event/DSValueTopic.html
new file mode 100644
index 00000000..35113641
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/DSValueTopic.html
@@ -0,0 +1,287 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSValueTopic (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="DSValueTopic (dslink-core 0.19.0 API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSValueTopic.html" target="_top">Frames</a></li>
+<li><a href="DSValueTopic.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.iot.dsa.node.event.DSTopic">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.iot.dsa.node.event</div>
+<h2 title="Class DSValueTopic" class="title">Class DSValueTopic</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">org.iot.dsa.node.event.DSTopic</a></li>
+<li>
+<ul class="inheritance">
+<li>org.iot.dsa.node.event.DSValueTopic</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public class <span class="typeNameLabel">DSValueTopic</span>
+extends <a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a>
+implements <a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></pre>
+<div class="block">This topic is for change of value events on DSNodes.  There are two types of events,
+ NODE_CHANGED for nodes that implement DSIValue and CHILD_CHANGED for child values of the
+ subscribed node.
+ <p>
+ Events will be one of the enums defined in the Event inner class.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></span></code>
+<div class="block">The possible events from this topic.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html#INSTANCE">INSTANCE</a></span></code>
+<div class="block">The only instance of this topic.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.event.DSTopic">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></h3>
+<code><a href="../../../../../org/iot/dsa/node/event/DSTopic.html#copy--">copy</a>, <a href="../../../../../org/iot/dsa/node/event/DSTopic.html#isEqual-java.lang.Object-">isEqual</a>, <a href="../../../../../org/iot/dsa/node/event/DSTopic.html#isNull--">isNull</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="INSTANCE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTANCE</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a> INSTANCE</pre>
+<div class="block">The only instance of this topic.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../org/iot/dsa/node/DSNode.html#VALUE_TOPIC"><code>DSNode.VALUE_TOPIC</code></a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/DSValueTopic.html" target="_top">Frames</a></li>
+<li><a href="DSValueTopic.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#methods.inherited.from.class.org.iot.dsa.node.event.DSTopic">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li>Method</li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/node/event/package-frame.html b/docs/javadoc/org/iot/dsa/node/event/package-frame.html
new file mode 100644
index 00000000..519dc4e9
--- /dev/null
+++ b/docs/javadoc/org/iot/dsa/node/event/package-frame.html
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node.event (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<h1 class="bar"><a href="../../../../../org/iot/dsa/node/event/package-summary.html" target="classFrame">org.iot.dsa.node.event</a></h1>
+<div class="indexContainer">
+<h2 title="Interfaces">Interfaces</h2>
+<ul title="Interfaces">
+<li><a href="DSIEvent.html" title="interface in org.iot.dsa.node.event" target="classFrame"><span class="interfaceName">DSIEvent</span></a></li>
+<li><a href="DSISubscriber.html" title="interface in org.iot.dsa.node.event" target="classFrame"><span class="interfaceName">DSISubscriber</span></a></li>
+</ul>
+<h2 title="Classes">Classes</h2>
+<ul title="Classes">
+<li><a href="DSInfoTopic.html" title="class in org.iot.dsa.node.event" target="classFrame">DSInfoTopic</a></li>
+<li><a href="DSTopic.html" title="class in org.iot.dsa.node.event" target="classFrame">DSTopic</a></li>
+<li><a href="DSValueTopic.html" title="class in org.iot.dsa.node.event" target="classFrame">DSValueTopic</a></li>
+</ul>
+<h2 title="Enums">Enums</h2>
+<ul title="Enums">
+<li><a href="DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event" target="classFrame">DSInfoTopic.Event</a></li>
+<li><a href="DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event" target="classFrame">DSValueTopic.Event</a></li>
+</ul>
+</div>
+</body>
+</html>
diff --git a/docs/javadoc/org/iot/dsa/io/msgpack/package-summary.html b/docs/javadoc/org/iot/dsa/node/event/package-summary.html
similarity index 52%
rename from docs/javadoc/org/iot/dsa/io/msgpack/package-summary.html
rename to docs/javadoc/org/iot/dsa/node/event/package-summary.html
index 51acc9d1..aadd5251 100644
--- a/docs/javadoc/org/iot/dsa/io/msgpack/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/node/event/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io.msgpack (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node.event (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.io.msgpack (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.node.event (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,11 +42,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/io/json/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/iot/dsa/logging/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/node/action/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/security/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -69,11 +69,34 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io.msgpack</h1>
+<h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node.event</h1>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Interface Summary table, listing interfaces, and an explanation">
+<caption><span>Interface Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a></td>
+<td class="colLast">
+<div class="block">This is an empty interface, DSTopics are allowed to define events however they wish.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event">DSISubscriber</a></td>
+<td class="colLast">
+<div class="block">DSISubscribers subscribe to DSTopics on DSNodes.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
 <table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
@@ -82,14 +105,45 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io.msgpack</h1>
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack">MsgpackReader</a></td>
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event">DSInfoTopic</a></td>
+<td class="colLast">
+<div class="block">This topic is for info related events on DSNodes.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event">DSTopic</a></td>
+<td class="colLast">
+<div class="block">DSISubscribers subscribe to DSTopics on DSNodes.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event">DSValueTopic</a></td>
+<td class="colLast">
+<div class="block">This topic is for change of value events on DSNodes.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Enum</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event">DSInfoTopic.Event</a></td>
 <td class="colLast">
-<div class="block">MsgPack implementation of DSReader.</div>
+<div class="block">The possible events for this topic.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack">MsgpackWriter</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colFirst"><a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event">DSValueTopic.Event</a></td>
+<td class="colLast">
+<div class="block">The possible events from this topic.</div>
+</td>
 </tr>
 </tbody>
 </table>
@@ -116,11 +170,11 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.io.msgpack</h1>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/io/json/package-summary.html">Prev&nbsp;Package</a></li>
-<li><a href="../../../../../org/iot/dsa/logging/package-summary.html">Next&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/node/action/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../../org/iot/dsa/security/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/package-summary.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/package-summary.html" target="_top">Frames</a></li>
 <li><a href="package-summary.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/docs/javadoc/org/iot/dsa/io/msgpack/package-tree.html b/docs/javadoc/org/iot/dsa/node/event/package-tree.html
similarity index 54%
rename from docs/javadoc/org/iot/dsa/io/msgpack/package-tree.html
rename to docs/javadoc/org/iot/dsa/node/event/package-tree.html
index 70af9a4c..05682f6a 100644
--- a/docs/javadoc/org/iot/dsa/io/msgpack/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/node/event/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.io.msgpack Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node.event Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.io.msgpack Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.node.event Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,11 +42,11 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/io/json/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/iot/dsa/logging/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/iot/dsa/node/action/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/iot/dsa/security/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
@@ -69,7 +69,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">Hierarchy For Package org.iot.dsa.io.msgpack</h1>
+<h1 class="title">Hierarchy For Package org.iot.dsa.node.event</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
@@ -80,14 +80,28 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io"><span class="typeNameLink">AbstractReader</span></a> (implements org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a>)
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSTopic</span></a> (implements org.iot.dsa.node.<a href="../../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>)
 <ul>
-<li type="circle">org.iot.dsa.io.msgpack.<a href="../../../../../org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">MsgpackReader</span></a> (implements org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a>)</li>
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSInfoTopic</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSValueTopic</span></a> (implements org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>)</li>
 </ul>
 </li>
-<li type="circle">org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/AbstractWriter.html" title="class in org.iot.dsa.io"><span class="typeNameLink">AbstractWriter</span></a> (implements java.io.Closeable, org.iot.dsa.io.<a href="../../../../../org/iot/dsa/io/DSIWriter.html" title="interface in org.iot.dsa.io">DSIWriter</a>)
+</ul>
+</li>
+</ul>
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">DSIEvent</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">DSISubscriber</span></a></li>
+</ul>
+<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
+<ul>
+<li type="circle">java.lang.Object
+<ul>
+<li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
-<li type="circle">org.iot.dsa.io.msgpack.<a href="../../../../../org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">MsgpackWriter</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">DSInfoTopic.Event</span></a> (implements org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>)</li>
+<li type="circle">org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">DSValueTopic.Event</span></a> (implements org.iot.dsa.node.event.<a href="../../../../../org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>)</li>
 </ul>
 </li>
 </ul>
@@ -114,11 +128,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/iot/dsa/io/json/package-tree.html">Prev</a></li>
-<li><a href="../../../../../org/iot/dsa/logging/package-tree.html">Next</a></li>
+<li><a href="../../../../../org/iot/dsa/node/action/package-tree.html">Prev</a></li>
+<li><a href="../../../../../org/iot/dsa/security/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/iot/dsa/io/msgpack/package-tree.html" target="_top">Frames</a></li>
+<li><a href="../../../../../index.html?org/iot/dsa/node/event/package-tree.html" target="_top">Frames</a></li>
 <li><a href="package-tree.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
diff --git a/docs/javadoc/org/iot/dsa/node/package-frame.html b/docs/javadoc/org/iot/dsa/node/package-frame.html
index 7f5b8bd3..88767869 100644
--- a/docs/javadoc/org/iot/dsa/node/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/node/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.node (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -18,9 +18,8 @@ <h2 title="Interfaces">Interfaces</h2>
 <li><a href="DSIMetadata.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIMetadata</span></a></li>
 <li><a href="DSINumber.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSINumber</span></a></li>
 <li><a href="DSIObject.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIObject</span></a></li>
-<li><a href="DSIPublisher.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIPublisher</span></a></li>
 <li><a href="DSIStatus.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIStatus</span></a></li>
-<li><a href="DSISubscriber.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSISubscriber</span></a></li>
+<li><a href="DSIStorable.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIStorable</span></a></li>
 <li><a href="DSIValue.html" title="interface in org.iot.dsa.node" target="classFrame"><span class="interfaceName">DSIValue</span></a></li>
 </ul>
 <h2 title="Classes">Classes</h2>
@@ -47,11 +46,11 @@ <h2 title="Classes">Classes</h2>
 <li><a href="DSStatus.html" title="class in org.iot.dsa.node" target="classFrame">DSStatus</a></li>
 <li><a href="DSString.html" title="class in org.iot.dsa.node" target="classFrame">DSString</a></li>
 <li><a href="DSValue.html" title="class in org.iot.dsa.node" target="classFrame">DSValue</a></li>
+<li><a href="DSValueNode.html" title="class in org.iot.dsa.node" target="classFrame">DSValueNode</a></li>
 </ul>
 <h2 title="Enums">Enums</h2>
 <ul title="Enums">
 <li><a href="DSElementType.html" title="enum in org.iot.dsa.node" target="classFrame">DSElementType</a></li>
-<li><a href="DSIPublisher.Event.html" title="enum in org.iot.dsa.node" target="classFrame">DSIPublisher.Event</a></li>
 <li><a href="DSValueType.html" title="enum in org.iot.dsa.node" target="classFrame">DSValueType</a></li>
 </ul>
 </div>
diff --git a/docs/javadoc/org/iot/dsa/node/package-summary.html b/docs/javadoc/org/iot/dsa/node/package-summary.html
index b551bd91..932ec465 100644
--- a/docs/javadoc/org/iot/dsa/node/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/node/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.node (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.node (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.node (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -116,24 +116,18 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node</h1>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node">DSIPublisher</a></td>
-<td class="colLast">
-<div class="block">DSEvent producer.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a></td>
 <td class="colLast">
 <div class="block">Indicates something that is/has a quality.</div>
 </td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a></td>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></td>
 <td class="colLast">
-<div class="block">Interface for receiving events from DSIPublishers.</div>
+<div class="block">Enables custom serialization for non-node values in the configuration database.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></td>
 <td class="colLast">
 <div class="block">How data values are represented in the node tree.</div>
@@ -245,13 +239,13 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node</h1>
 <tr class="rowColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node">DSNode</a></td>
 <td class="colLast">
-<div class="block">The primary organization unit of the node tree.</div>
+<div class="block">The organizational unit of the node tree.</div>
 </td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/node/DSNull.html" title="class in org.iot.dsa.node">DSNull</a></td>
 <td class="colLast">
-<div class="block">This is used for decoding raw json.</div>
+<div class="block">Try not to use, it is for decoding raw json.</div>
 </td>
 </tr>
 <tr class="rowColor">
@@ -284,6 +278,12 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node</h1>
 <div class="block">A convenience that provides some common default behavior.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node">DSValueNode</a></td>
+<td class="colLast">
+<div class="block">A convenience implementation of a node that is also a value.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
@@ -302,12 +302,6 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.node</h1>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node">DSIPublisher.Event</a></td>
-<td class="colLast">
-<div class="block">Passed to DSISubscriber onEvent to describe the event.</div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node">DSValueType</a></td>
 <td class="colLast">
 <div class="block">These are the primitive types in the DSA protocol.</div>
diff --git a/docs/javadoc/org/iot/dsa/node/package-tree.html b/docs/javadoc/org/iot/dsa/node/package-tree.html
index 70770e0b..c426a5f9 100644
--- a/docs/javadoc/org/iot/dsa/node/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/node/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.node Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.node Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.node Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.node Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -80,10 +80,14 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInfo</span></a> (implements org.iot.dsa.dslink.responder.<a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>)</li>
-<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInfo</span></a> (implements org.iot.dsa.dslink.responder.<a href="../../../../org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a>)</li>
+<li type="circle">org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a> (implements org.iot.dsa.logging.<a href="../../../../org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)
 <ul>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSNode</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, java.lang.Iterable&lt;T&gt;)</li>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSNode</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, java.lang.Iterable&lt;T&gt;)
+<ul>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSValueNode</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>)</li>
+</ul>
+</li>
 </ul>
 </li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSMap.Entry.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSMap.Entry</span></a></li>
@@ -108,11 +112,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSString</span></a></li>
 </ul>
 </li>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFlexEnum</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFlexEnum</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSFloat.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFloat</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node">DSINumber</a>)</li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInt</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node">DSINumber</a>)</li>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSJavaEnum</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>)</li>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSStatus</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSJavaEnum</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSStatus</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
 </ul>
 </li>
 </ul>
@@ -129,9 +133,8 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIValue</span></a></li>
 </ul>
 </li>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIPublisher</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIStatus</span></a></li>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSISubscriber</span></a></li>
+<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIStorable</span></a></li>
 </ul>
 <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
@@ -139,7 +142,6 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
-<li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSIPublisher.Event</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSValueType</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSElementType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSElementType</span></a></li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/package-frame.html b/docs/javadoc/org/iot/dsa/package-frame.html
index 637fb43e..ae68f966 100644
--- a/docs/javadoc/org/iot/dsa/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
diff --git a/docs/javadoc/org/iot/dsa/package-summary.html b/docs/javadoc/org/iot/dsa/package-summary.html
index c21735bd..df8aca96 100644
--- a/docs/javadoc/org/iot/dsa/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/package-tree.html b/docs/javadoc/org/iot/dsa/package-tree.html
index 47541400..66b35538 100644
--- a/docs/javadoc/org/iot/dsa/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -81,7 +81,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">java.lang.Object
 <ul>
 <li type="circle">org.iot.dsa.<a href="../../../org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime</span></a></li>
-<li type="circle">org.iot.dsa.<a href="../../../org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime.Timer</span></a></li>
+<li type="circle">org.iot.dsa.<a href="../../../org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime.Timer</span></a> (implements java.lang.Runnable)</li>
 </ul>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/security/DSIPassword.html b/docs/javadoc/org/iot/dsa/security/DSIPassword.html
index 227c4ec9..f23253c2 100644
--- a/docs/javadoc/org/iot/dsa/security/DSIPassword.html
+++ b/docs/javadoc/org/iot/dsa/security/DSIPassword.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSIPassword (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSIPassword (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSIPassword (dslink-core 0.11.0 API)";
+            parent.document.title="DSIPassword (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -141,7 +141,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from interface&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSIValue.html#getValueType--">getValueType</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSIValue.html#getValueType--">getValueType</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#isNull--">isNull</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#toElement--">toElement</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIObject">
diff --git a/docs/javadoc/org/iot/dsa/security/DSKeys.Signer.html b/docs/javadoc/org/iot/dsa/security/DSKeys.Signer.html
index a45d21e8..14103adf 100644
--- a/docs/javadoc/org/iot/dsa/security/DSKeys.Signer.html
+++ b/docs/javadoc/org/iot/dsa/security/DSKeys.Signer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSKeys.Signer (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSKeys.Signer (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSKeys.Signer (dslink-core 0.11.0 API)";
+            parent.document.title="DSKeys.Signer (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/security/DSKeys.Verifier.html b/docs/javadoc/org/iot/dsa/security/DSKeys.Verifier.html
index 010a4197..7217758c 100644
--- a/docs/javadoc/org/iot/dsa/security/DSKeys.Verifier.html
+++ b/docs/javadoc/org/iot/dsa/security/DSKeys.Verifier.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSKeys.Verifier (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSKeys.Verifier (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSKeys.Verifier (dslink-core 0.11.0 API)";
+            parent.document.title="DSKeys.Verifier (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/security/DSKeys.html b/docs/javadoc/org/iot/dsa/security/DSKeys.html
index be46e83c..e4dca38b 100644
--- a/docs/javadoc/org/iot/dsa/security/DSKeys.html
+++ b/docs/javadoc/org/iot/dsa/security/DSKeys.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSKeys (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSKeys (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSKeys (dslink-core 0.11.0 API)";
+            parent.document.title="DSKeys (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/security/DSPasswordAes.html b/docs/javadoc/org/iot/dsa/security/DSPasswordAes.html
index 8ae5910d..87f05354 100644
--- a/docs/javadoc/org/iot/dsa/security/DSPasswordAes.html
+++ b/docs/javadoc/org/iot/dsa/security/DSPasswordAes.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSPasswordAes (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSPasswordAes (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSPasswordAes (dslink-core 0.11.0 API)";
+            parent.document.title="DSPasswordAes (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":9};
+var methods = {"i0":10,"i1":9,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -113,13 +113,13 @@ <h2 title="Class DSPasswordAes" class="title">Class DSPasswordAes</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>, <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>, <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSPasswordAes</span>
 extends <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>
-implements <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a></pre>
+implements <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></pre>
 <div class="block">Stores an encrypted password which can be decrypted.</div>
 </li>
 </ul>
@@ -219,28 +219,35 @@ <h3>Method Summary</h3>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordAes.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</code>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 </td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordAes.html#store--">store</a></span>()</code>
+<div class="block">Serialize the value for the configuration database.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordAes.html#toElement--">toElement</a></span>()</code>
 <div class="block">Returns a string representing the url safe base64 encoding of the hash.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordAes.html#toString--">toString</a></span>()</code>
 <div class="block">If isNull(), returns "null", otherwise returns toElement().toString()</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordAes.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">Creates a encrypted password for the given clear text.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordAes.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Creates a encrypted password for the given clear text.</div>
@@ -252,7 +259,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -262,13 +269,6 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <code>clone, finalize, getClass, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIValue">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIObject">
 <!--   -->
 </a>
@@ -448,6 +448,22 @@ <h4>isValid</h4>
 </dl>
 </li>
 </ul>
+<a name="store--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>store</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a>&nbsp;store()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">DSIStorable</a></code></span></div>
+<div class="block">Serialize the value for the configuration database.  Can be a different element type than
+ toElement().</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
+</dl>
+</li>
+</ul>
 <a name="restore-org.iot.dsa.node.DSElement-">
 <!--   -->
 </a>
@@ -455,13 +471,12 @@ <h4>isValid</h4>
 <li class="blockList">
 <h4>restore</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security">DSPasswordAes</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">DSValue</a></code></span></div>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">DSIStorable</a></code></span></div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/security/DSPasswordSha256.html b/docs/javadoc/org/iot/dsa/security/DSPasswordSha256.html
index 65941b6b..95f69bd8 100644
--- a/docs/javadoc/org/iot/dsa/security/DSPasswordSha256.html
+++ b/docs/javadoc/org/iot/dsa/security/DSPasswordSha256.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSPasswordSha256 (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSPasswordSha256 (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSPasswordSha256 (dslink-core 0.11.0 API)";
+            parent.document.title="DSPasswordSha256 (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9};
+var methods = {"i0":9,"i1":9,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -113,13 +113,13 @@ <h2 title="Class DSPasswordSha256" class="title">Class DSPasswordSha256</h2>
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>, <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a></dd>
+<dd><a href="../../../../org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>, <a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>, <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a></dd>
 </dl>
 <hr>
 <br>
 <pre>public class <span class="typeNameLabel">DSPasswordSha256</span>
 extends <a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a>
-implements <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a></pre>
+implements <a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>, <a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></pre>
 <div class="block">Stores and verifies passwords using a SHA-256 hash of the text.</div>
 </li>
 </ul>
@@ -213,28 +213,35 @@ <h3>Method Summary</h3>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html#restore-org.iot.dsa.node.DSElement-">restore</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</code>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 </td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html#store--">store</a></span>()</code>
+<div class="block">Serialize the value for the configuration database.</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code><a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html#toElement--">toElement</a></span>()</code>
 <div class="block">Returns a string representing the url safe base64 encoding of the hash.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html#toString--">toString</a></span>()</code>
 <div class="block">If isNull(), returns "null", otherwise returns toElement().toString()</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html#valueOf-org.iot.dsa.node.DSElement-">valueOf</a></span>(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;arg)</code>
 <div class="block">Creates a digest password for the given clear text.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPasswordSha256.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;arg)</code>
 <div class="block">Creates a digest password for the given clear text.</div>
@@ -246,7 +253,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -256,13 +263,6 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <code>clone, finalize, getClass, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIValue">
-<!--   -->
-</a>
-<h3>Methods inherited from interface&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSIValue.html#store--">store</a></code></li>
-</ul>
-<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.org.iot.dsa.node.DSIObject">
 <!--   -->
 </a>
@@ -428,6 +428,22 @@ <h4>isValid</h4>
 </dl>
 </li>
 </ul>
+<a name="store--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>store</h4>
+<pre>public&nbsp;<a href="../../../../org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node">DSString</a>&nbsp;store()</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">DSIStorable</a></code></span></div>
+<div class="block">Serialize the value for the configuration database.  Can be a different element type than
+ toElement().</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#store--">store</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
+</dl>
+</li>
+</ul>
 <a name="restore-org.iot.dsa.node.DSElement-">
 <!--   -->
 </a>
@@ -435,13 +451,12 @@ <h4>isValid</h4>
 <li class="blockList">
 <h4>restore</h4>
 <pre>public&nbsp;<a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security">DSPasswordSha256</a>&nbsp;restore(<a href="../../../../org/iot/dsa/node/DSElement.html" title="class in org.iot.dsa.node">DSElement</a>&nbsp;element)</pre>
-<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">DSValue</a></code></span></div>
-<div class="block">Calls valueOf(arg).</div>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">DSIStorable</a></code></span></div>
+<div class="block">Deserialize a value from the configuration database, these will be values returned from the
+ store() method.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSIValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a></code></dd>
-<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code><a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in class&nbsp;<code><a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></code></dd>
+<dd><code><a href="../../../../org/iot/dsa/node/DSIStorable.html#restore-org.iot.dsa.node.DSElement-">restore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a></code></dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/javadoc/org/iot/dsa/security/DSPermission.html b/docs/javadoc/org/iot/dsa/security/DSPermission.html
index 37f10f90..68be8a60 100644
--- a/docs/javadoc/org/iot/dsa/security/DSPermission.html
+++ b/docs/javadoc/org/iot/dsa/security/DSPermission.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSPermission (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSPermission (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSPermission (dslink-core 0.11.0 API)";
+            parent.document.title="DSPermission (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":9};
+var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":9,"i9":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -194,11 +194,15 @@ <h3>Method Summary</h3>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPermission.html#valueOf-int-">valueOf</a></span>(int&nbsp;v2byte)</code>&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static <a href="../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPermission.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a>[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/security/DSPermission.html#values--">values</a></span>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
@@ -365,6 +369,15 @@ <h4>isList</h4>
 <pre>public&nbsp;boolean&nbsp;isList()</pre>
 </li>
 </ul>
+<a name="forString-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>forString</h4>
+<pre>public static&nbsp;<a href="../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a>&nbsp;forString(java.lang.String&nbsp;str)</pre>
+</li>
+</ul>
 <a name="toString--">
 <!--   -->
 </a>
@@ -378,13 +391,13 @@ <h4>toString</h4>
 </dl>
 </li>
 </ul>
-<a name="forString-java.lang.String-">
+<a name="valueOf-int-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>forString</h4>
-<pre>public static&nbsp;<a href="../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a>&nbsp;forString(java.lang.String&nbsp;str)</pre>
+<h4>valueOf</h4>
+<pre>public static&nbsp;<a href="../../../../org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security">DSPermission</a>&nbsp;valueOf(int&nbsp;v2byte)</pre>
 </li>
 </ul>
 </li>
diff --git a/docs/javadoc/org/iot/dsa/security/package-frame.html b/docs/javadoc/org/iot/dsa/security/package-frame.html
index b9441d97..9ef5c4a2 100644
--- a/docs/javadoc/org/iot/dsa/security/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/security/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.security (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.security (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/docs/javadoc/org/iot/dsa/security/package-summary.html b/docs/javadoc/org/iot/dsa/security/package-summary.html
index b2b77ee6..3c21dbcf 100644
--- a/docs/javadoc/org/iot/dsa/security/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/security/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.security (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.security (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.security (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.security (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/action/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/iot/dsa/node/event/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/iot/dsa/time/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
@@ -164,7 +164,7 @@ <h1 title="Package" class="title">Package&nbsp;org.iot.dsa.security</h1>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/action/package-summary.html">Prev&nbsp;Package</a></li>
+<li><a href="../../../../org/iot/dsa/node/event/package-summary.html">Prev&nbsp;Package</a></li>
 <li><a href="../../../../org/iot/dsa/time/package-summary.html">Next&nbsp;Package</a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/security/package-tree.html b/docs/javadoc/org/iot/dsa/security/package-tree.html
index e22f1464..68df136c 100644
--- a/docs/javadoc/org/iot/dsa/security/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/security/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.security Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.security Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.security Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.security Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -42,7 +42,7 @@
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/action/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/iot/dsa/node/event/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/iot/dsa/time/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
@@ -85,8 +85,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSKeys.Verifier.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSKeys.Verifier</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSValue</span></a> (implements org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>)
 <ul>
-<li type="circle">org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordAes</span></a> (implements org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>)</li>
-<li type="circle">org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordSha256</span></a> (implements org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>)</li>
+<li type="circle">org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordAes</span></a> (implements org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
+<li type="circle">org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordSha256</span></a> (implements org.iot.dsa.security.<a href="../../../../org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>, org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
 </ul>
 </li>
 </ul>
@@ -137,7 +137,7 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../org/iot/dsa/node/action/package-tree.html">Prev</a></li>
+<li><a href="../../../../org/iot/dsa/node/event/package-tree.html">Prev</a></li>
 <li><a href="../../../../org/iot/dsa/time/package-tree.html">Next</a></li>
 </ul>
 <ul class="navList">
diff --git a/docs/javadoc/org/iot/dsa/time/DSDateTime.html b/docs/javadoc/org/iot/dsa/time/DSDateTime.html
index bb4fdc25..4446f155 100644
--- a/docs/javadoc/org/iot/dsa/time/DSDateTime.html
+++ b/docs/javadoc/org/iot/dsa/time/DSDateTime.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSDateTime (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSDateTime (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSDateTime (dslink-core 0.11.0 API)";
+            parent.document.title="DSDateTime (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -231,7 +231,7 @@ <h3>Method Summary</h3>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.iot.dsa.node.<a href="../../../../org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node">DSValue</a></h3>
-<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#restore-org.iot.dsa.node.DSElement-">restore</a>, <a href="../../../../org/iot/dsa/node/DSValue.html#store--">store</a></code></li>
+<code><a href="../../../../org/iot/dsa/node/DSValue.html#copy--">copy</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/docs/javadoc/org/iot/dsa/time/DSInterval.html b/docs/javadoc/org/iot/dsa/time/DSInterval.html
index 9afff1cc..5e3de165 100644
--- a/docs/javadoc/org/iot/dsa/time/DSInterval.html
+++ b/docs/javadoc/org/iot/dsa/time/DSInterval.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSInterval (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSInterval (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSInterval (dslink-core 0.11.0 API)";
+            parent.document.title="DSInterval (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/time/DSTime.html b/docs/javadoc/org/iot/dsa/time/DSTime.html
index c031294c..6199b5c0 100644
--- a/docs/javadoc/org/iot/dsa/time/DSTime.html
+++ b/docs/javadoc/org/iot/dsa/time/DSTime.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSTime (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:09 PST 2018 -->
+<title>DSTime (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSTime (dslink-core 0.11.0 API)";
+            parent.document.title="DSTime (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9,"i16":9,"i17":9,"i18":9,"i19":9,"i20":9,"i21":9,"i22":9,"i23":9,"i24":9,"i25":9,"i26":9,"i27":9,"i28":9,"i29":9,"i30":9,"i31":9,"i32":9,"i33":9,"i34":9,"i35":9,"i36":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -473,6 +473,14 @@ <h3>Method Summary</h3>
 </td>
 </tr>
 <tr id="i34" class="altColor">
+<td class="colFirst"><code>static long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/time/DSTime.html#millisToNanos-long-">millisToNanos</a></span>(long&nbsp;millis)</code>&nbsp;</td>
+</tr>
+<tr id="i35" class="rowColor">
+<td class="colFirst"><code>static long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/time/DSTime.html#nanosToMillis-long-">nanosToMillis</a></span>(long&nbsp;nanos)</code>&nbsp;</td>
+</tr>
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/time/DSTime.html#recycle-java.util.Calendar-">recycle</a></span>(java.util.Calendar&nbsp;cal)</code>
 <div class="block">Return a calendar instance for reuse.</div>
@@ -1406,6 +1414,24 @@ <h4>getCalendar</h4>
  timezone to TimeZone.getDefault().</div>
 </li>
 </ul>
+<a name="millisToNanos-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>millisToNanos</h4>
+<pre>public static&nbsp;long&nbsp;millisToNanos(long&nbsp;millis)</pre>
+</li>
+</ul>
+<a name="nanosToMillis-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>nanosToMillis</h4>
+<pre>public static&nbsp;long&nbsp;nanosToMillis(long&nbsp;nanos)</pre>
+</li>
+</ul>
 <a name="recycle-java.util.Calendar-">
 <!--   -->
 </a>
diff --git a/docs/javadoc/org/iot/dsa/time/package-frame.html b/docs/javadoc/org/iot/dsa/time/package-frame.html
index d5d2529b..d4525533 100644
--- a/docs/javadoc/org/iot/dsa/time/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/time/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.time (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.time (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/docs/javadoc/org/iot/dsa/time/package-summary.html b/docs/javadoc/org/iot/dsa/time/package-summary.html
index dcda0f6f..b0e0ad95 100644
--- a/docs/javadoc/org/iot/dsa/time/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/time/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.time (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.time (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.time (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.time (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/time/package-tree.html b/docs/javadoc/org/iot/dsa/time/package-tree.html
index 258e4d3b..1491152c 100644
--- a/docs/javadoc/org/iot/dsa/time/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/time/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.time Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.time Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.time Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.time Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/util/DSException.html b/docs/javadoc/org/iot/dsa/util/DSException.html
index dab63ccf..df3315fc 100644
--- a/docs/javadoc/org/iot/dsa/util/DSException.html
+++ b/docs/javadoc/org/iot/dsa/util/DSException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSException (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSException (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSException (dslink-core 0.11.0 API)";
+            parent.document.title="DSException (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":9,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -154,7 +154,7 @@ <h3>Constructor Summary</h3>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#DSException-java.lang.Exception-">DSException</a></span>(java.lang.Exception&nbsp;inner)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#DSException-java.lang.Throwable-">DSException</a></span>(java.lang.Throwable&nbsp;inner)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -192,25 +192,38 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#initCause-java.lang.Throwable-">initCause</a></span>(java.lang.Throwable&nbsp;cause)</code>&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#makeMessage-java.lang.Throwable-">makeMessage</a></span>(java.lang.Throwable&nbsp;t)</code>
+<div class="block">Attempts come up with the best description of the argument.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static java.lang.RuntimeException</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#makeRuntime-java.lang.Throwable-">makeRuntime</a></span>(java.lang.Throwable&nbsp;x)</code>
+<div class="block">If the given exception is already a runtime exception, it is cast and returned,
+ otherwise it will be returned wrapped by an instance of this class.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#printStackTrace--">printStackTrace</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#printStackTrace-java.io.PrintStream-">printStackTrace</a></span>(java.io.PrintStream&nbsp;out)</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#printStackTrace-java.io.PrintWriter-">printStackTrace</a></span>(java.io.PrintWriter&nbsp;out)</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#throwRuntime-java.lang.Exception-">throwRuntime</a></span>(java.lang.Exception&nbsp;x)</code>
-<div class="block">If the given exception is already a runtime exception, it is rethrown, otherwise it will be
- thrown wrapped by an instance of this class.</div>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#throwRuntime-java.lang.Throwable-">throwRuntime</a></span>(java.lang.Throwable&nbsp;x)</code>
+<div class="block">If the given exception is already a runtime exception, it is rethrown, otherwise
+ it will be thrown wrapped by an instance of this class.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSException.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -243,13 +256,13 @@ <h3>Methods inherited from class&nbsp;java.lang.Object</h3>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DSException-java.lang.Exception-">
+<a name="DSException-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DSException</h4>
-<pre>public&nbsp;DSException(java.lang.Exception&nbsp;inner)</pre>
+<pre>public&nbsp;DSException(java.lang.Throwable&nbsp;inner)</pre>
 </li>
 </ul>
 </li>
@@ -312,6 +325,27 @@ <h4>getStackTrace</h4>
 </dl>
 </li>
 </ul>
+<a name="makeMessage-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>makeMessage</h4>
+<pre>public static&nbsp;java.lang.String&nbsp;makeMessage(java.lang.Throwable&nbsp;t)</pre>
+<div class="block">Attempts come up with the best description of the argument.</div>
+</li>
+</ul>
+<a name="makeRuntime-java.lang.Throwable-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>makeRuntime</h4>
+<pre>public static&nbsp;java.lang.RuntimeException&nbsp;makeRuntime(java.lang.Throwable&nbsp;x)</pre>
+<div class="block">If the given exception is already a runtime exception, it is cast and returned,
+ otherwise it will be returned wrapped by an instance of this class.</div>
+</li>
+</ul>
 <a name="printStackTrace--">
 <!--   -->
 </a>
@@ -364,15 +398,15 @@ <h4>initCause</h4>
 </dl>
 </li>
 </ul>
-<a name="throwRuntime-java.lang.Exception-">
+<a name="throwRuntime-java.lang.Throwable-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>throwRuntime</h4>
-<pre>public static&nbsp;void&nbsp;throwRuntime(java.lang.Exception&nbsp;x)</pre>
-<div class="block">If the given exception is already a runtime exception, it is rethrown, otherwise it will be
- thrown wrapped by an instance of this class.</div>
+<pre>public static&nbsp;void&nbsp;throwRuntime(java.lang.Throwable&nbsp;x)</pre>
+<div class="block">If the given exception is already a runtime exception, it is rethrown, otherwise
+ it will be thrown wrapped by an instance of this class.</div>
 </li>
 </ul>
 <a name="toString--">
diff --git a/docs/javadoc/org/iot/dsa/util/DSUtil.html b/docs/javadoc/org/iot/dsa/util/DSUtil.html
index 89a8d121..6ad1049f 100644
--- a/docs/javadoc/org/iot/dsa/util/DSUtil.html
+++ b/docs/javadoc/org/iot/dsa/util/DSUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>DSUtil (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>DSUtil (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="DSUtil (dslink-core 0.11.0 API)";
+            parent.document.title="DSUtil (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -133,7 +133,7 @@ <h3>Method Summary</h3>
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/iot/dsa/util/DSUtil.html#equal-java.lang.Object-java.lang.Object-">equal</a></span>(java.lang.Object&nbsp;o1,
      java.lang.Object&nbsp;o2)</code>
-<div class="block">Comparison that takes null into account.</div>
+<div class="block">Comparison that takes null into account; null == null.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -181,7 +181,7 @@ <h3>Method Detail</h3>
 <h4>equal</h4>
 <pre>public static&nbsp;boolean&nbsp;equal(java.lang.Object&nbsp;o1,
                             java.lang.Object&nbsp;o2)</pre>
-<div class="block">Comparison that takes null into account.  Null == null.</div>
+<div class="block">Comparison that takes null into account; null == null.</div>
 </li>
 </ul>
 <a name="getBit-int-int-">
diff --git a/docs/javadoc/org/iot/dsa/util/package-frame.html b/docs/javadoc/org/iot/dsa/util/package-frame.html
index 31e61238..4e95c379 100644
--- a/docs/javadoc/org/iot/dsa/util/package-frame.html
+++ b/docs/javadoc/org/iot/dsa/util/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>org.iot.dsa.util (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.util (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
diff --git a/docs/javadoc/org/iot/dsa/util/package-summary.html b/docs/javadoc/org/iot/dsa/util/package-summary.html
index 68cb4fce..b6cb4231 100644
--- a/docs/javadoc/org/iot/dsa/util/package-summary.html
+++ b/docs/javadoc/org/iot/dsa/util/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>org.iot.dsa.util (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.util (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.util (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.util (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/org/iot/dsa/util/package-tree.html b/docs/javadoc/org/iot/dsa/util/package-tree.html
index 5d864612..25a06370 100644
--- a/docs/javadoc/org/iot/dsa/util/package-tree.html
+++ b/docs/javadoc/org/iot/dsa/util/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>org.iot.dsa.util Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>org.iot.dsa.util Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="org.iot.dsa.util Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="org.iot.dsa.util Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
diff --git a/docs/javadoc/overview-frame.html b/docs/javadoc/overview-frame.html
index 6f3da7c5..e1fc07fc 100644
--- a/docs/javadoc/overview-frame.html
+++ b/docs/javadoc/overview-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:39 PST 2017 -->
-<title>Overview List (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Overview List (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -19,10 +19,10 @@ <h2 title="Packages">Packages</h2>
 <li><a href="org/iot/dsa/dslink/responder/package-frame.html" target="packageFrame">org.iot.dsa.dslink.responder</a></li>
 <li><a href="org/iot/dsa/io/package-frame.html" target="packageFrame">org.iot.dsa.io</a></li>
 <li><a href="org/iot/dsa/io/json/package-frame.html" target="packageFrame">org.iot.dsa.io.json</a></li>
-<li><a href="org/iot/dsa/io/msgpack/package-frame.html" target="packageFrame">org.iot.dsa.io.msgpack</a></li>
 <li><a href="org/iot/dsa/logging/package-frame.html" target="packageFrame">org.iot.dsa.logging</a></li>
 <li><a href="org/iot/dsa/node/package-frame.html" target="packageFrame">org.iot.dsa.node</a></li>
 <li><a href="org/iot/dsa/node/action/package-frame.html" target="packageFrame">org.iot.dsa.node.action</a></li>
+<li><a href="org/iot/dsa/node/event/package-frame.html" target="packageFrame">org.iot.dsa.node.event</a></li>
 <li><a href="org/iot/dsa/security/package-frame.html" target="packageFrame">org.iot.dsa.security</a></li>
 <li><a href="org/iot/dsa/time/package-frame.html" target="packageFrame">org.iot.dsa.time</a></li>
 <li><a href="org/iot/dsa/util/package-frame.html" target="packageFrame">org.iot.dsa.util</a></li>
diff --git a/docs/javadoc/overview-summary.html b/docs/javadoc/overview-summary.html
index ad189671..e570fbcb 100644
--- a/docs/javadoc/overview-summary.html
+++ b/docs/javadoc/overview-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>Overview (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Overview (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Overview (dslink-core 0.11.0 API)";
+            parent.document.title="Overview (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -69,7 +69,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h1 class="title">dslink-core 0.11.0 API</h1>
+<h1 class="title">dslink-core 0.19.0 API</h1>
 </div>
 <div class="contentContainer">
 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Packages table, listing packages, and an explanation">
@@ -105,32 +105,34 @@ <h1 class="title">dslink-core 0.11.0 API</h1>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a href="org/iot/dsa/io/package-summary.html">org.iot.dsa.io</a></td>
-<td class="colLast">&nbsp;</td>
+<td class="colLast">
+<div class="block">Node serialization and streaming abstraction for JSON and MsgPack.</div>
+</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a href="org/iot/dsa/io/json/package-summary.html">org.iot.dsa.io.json</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="org/iot/dsa/io/msgpack/package-summary.html">org.iot.dsa.io.msgpack</a></td>
-<td class="colLast">&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><a href="org/iot/dsa/logging/package-summary.html">org.iot.dsa.logging</a></td>
 <td class="colLast">
 <div class="block">Async handler for Java Util Logging that also manages log backups.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="org/iot/dsa/node/package-summary.html">org.iot.dsa.node</a></td>
 <td class="colLast">
 <div class="block">Persistent data model used to build the node tree of a link.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="org/iot/dsa/node/action/package-summary.html">org.iot.dsa.node.action</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><a href="org/iot/dsa/node/event/package-summary.html">org.iot.dsa.node.event</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><a href="org/iot/dsa/security/package-summary.html">org.iot.dsa.security</a></td>
 <td class="colLast">&nbsp;</td>
diff --git a/docs/javadoc/overview-tree.html b/docs/javadoc/overview-tree.html
index f8e19bcc..db3d0ade 100644
--- a/docs/javadoc/overview-tree.html
+++ b/docs/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>Class Hierarchy (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Class Hierarchy (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (dslink-core 0.11.0 API)";
+            parent.document.title="Class Hierarchy (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -78,10 +78,10 @@ <h1 class="title">Hierarchy For All Packages</h1>
 <li><a href="org/iot/dsa/dslink/responder/package-tree.html">org.iot.dsa.dslink.responder</a>, </li>
 <li><a href="org/iot/dsa/io/package-tree.html">org.iot.dsa.io</a>, </li>
 <li><a href="org/iot/dsa/io/json/package-tree.html">org.iot.dsa.io.json</a>, </li>
-<li><a href="org/iot/dsa/io/msgpack/package-tree.html">org.iot.dsa.io.msgpack</a>, </li>
 <li><a href="org/iot/dsa/logging/package-tree.html">org.iot.dsa.logging</a>, </li>
 <li><a href="org/iot/dsa/node/package-tree.html">org.iot.dsa.node</a>, </li>
 <li><a href="org/iot/dsa/node/action/package-tree.html">org.iot.dsa.node.action</a>, </li>
+<li><a href="org/iot/dsa/node/event/package-tree.html">org.iot.dsa.node.event</a>, </li>
 <li><a href="org/iot/dsa/security/package-tree.html">org.iot.dsa.security</a>, </li>
 <li><a href="org/iot/dsa/time/package-tree.html">org.iot.dsa.time</a>, </li>
 <li><a href="org/iot/dsa/util/package-tree.html">org.iot.dsa.util</a></li>
@@ -92,12 +92,15 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Object
 <ul>
-<li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractInvokeHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a>)</li>
+<li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/AbstractInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractInvokeHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundInvokeHandler</a>)
+<ul>
+<li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/SimpleInvokeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">SimpleInvokeHandler</span></a></li>
+</ul>
+</li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/AbstractListHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractListHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundListHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundListHandler</a>)</li>
 <li type="circle">org.iot.dsa.io.<a href="org/iot/dsa/io/AbstractReader.html" title="class in org.iot.dsa.io"><span class="typeNameLink">AbstractReader</span></a> (implements org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a>)
 <ul>
 <li type="circle">org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonReader.html" title="class in org.iot.dsa.io.json"><span class="typeNameLink">JsonReader</span></a> (implements org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a>, org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonConstants.html" title="interface in org.iot.dsa.io.json">JsonConstants</a>)</li>
-<li type="circle">org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackReader.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">MsgpackReader</span></a> (implements org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.html" title="interface in org.iot.dsa.io">DSIReader</a>)</li>
 </ul>
 </li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/AbstractSubscribeHandler.html" title="class in org.iot.dsa.dslink.requester"><span class="typeNameLink">AbstractSubscribeHandler</span></a> (implements org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundSubscribeHandler.html" title="interface in org.iot.dsa.dslink.requester">OutboundSubscribeHandler</a>)</li>
@@ -109,25 +112,25 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.iot.dsa.io.json.<a href="org/iot/dsa/io/json/JsonWriter.html" title="class in org.iot.dsa.io.json"><span class="typeNameLink">JsonWriter</span></a></li>
 </ul>
 </li>
-<li type="circle">org.iot.dsa.io.msgpack.<a href="org/iot/dsa/io/msgpack/MsgpackWriter.html" title="class in org.iot.dsa.io.msgpack"><span class="typeNameLink">MsgpackWriter</span></a></li>
 </ul>
 </li>
 <li type="circle">org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSAction.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">DSAction</span></a> (implements org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionSpec.html" title="interface in org.iot.dsa.node.action">ActionSpec</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>)</li>
+<li type="circle">org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/DSActionValues.html" title="class in org.iot.dsa.node.action"><span class="typeNameLink">DSActionValues</span></a> (implements org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionValues.html" title="interface in org.iot.dsa.node.action">ActionValues</a>)</li>
 <li type="circle">org.iot.dsa.io.<a href="org/iot/dsa/io/DSBase64.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSBase64</span></a></li>
-<li type="circle">org.iot.dsa.io.<a href="org/iot/dsa/io/DSByteBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSByteBuffer</span></a></li>
-<li type="circle">org.iot.dsa.io.<a href="org/iot/dsa/io/DSCharBuffer.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSCharBuffer</span></a></li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInfo</span></a> (implements org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node">DSISubscriber</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSInfo.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInfo</span></a> (implements org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/ApiObject.html" title="interface in org.iot.dsa.dslink.responder">ApiObject</a>)</li>
 <li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSKeys</span></a></li>
 <li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.Signer.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSKeys.Signer</span></a></li>
 <li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSKeys.Verifier.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSKeys.Verifier</span></a></li>
-<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConfig</span></a></li>
-<li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a>
+<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConfig.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConfig</span></a> (implements org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)</li>
+<li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSLogger.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">DSLogger</span></a> (implements org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)
 <ul>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSNode</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>, java.lang.Iterable&lt;T&gt;)
 <ul>
-<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLink</span></a> (implements org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink">DSIResponder</a>, java.lang.Runnable)</li>
+<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLink.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLink</span></a> (implements java.lang.Runnable)</li>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConnection</span></a></li>
-<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRootNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSRootNode</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSMainNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSMainNode</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSSysNode.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSSysNode</span></a></li>
+<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueNode.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSValueNode</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>)</li>
 </ul>
 </li>
 </ul>
@@ -138,8 +141,14 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSPath.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSPath</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSRegistry.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSRegistry</span></a></li>
 <li type="circle">org.iot.dsa.<a href="org/iot/dsa/DSRuntime.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime</span></a></li>
-<li type="circle">org.iot.dsa.<a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime.Timer</span></a></li>
+<li type="circle">org.iot.dsa.<a href="org/iot/dsa/DSRuntime.Timer.html" title="class in org.iot.dsa"><span class="typeNameLink">DSRuntime.Timer</span></a> (implements java.lang.Runnable)</li>
 <li type="circle">org.iot.dsa.time.<a href="org/iot/dsa/time/DSTime.html" title="class in org.iot.dsa.time"><span class="typeNameLink">DSTime</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSTopic</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node">DSIObject</a>)
+<ul>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSInfoTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSInfoTopic</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSValueTopic.html" title="class in org.iot.dsa.node.event"><span class="typeNameLink">DSValueTopic</span></a> (implements org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>)</li>
+</ul>
+</li>
 <li type="circle">org.iot.dsa.util.<a href="org/iot/dsa/util/DSUtil.html" title="class in org.iot.dsa.util"><span class="typeNameLink">DSUtil</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSValue.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSValue</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIValue.html" title="interface in org.iot.dsa.node">DSIValue</a>)
 <ul>
@@ -160,18 +169,18 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSString.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSString</span></a></li>
 </ul>
 </li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFlexEnum</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSFlexEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFlexEnum</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSFloat.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSFloat</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node">DSINumber</a>)</li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSInt.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSInt</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node">DSINumber</a>)</li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSJavaEnum</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>)</li>
-<li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordAes</span></a> (implements org.iot.dsa.security.<a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>)</li>
-<li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordSha256</span></a> (implements org.iot.dsa.security.<a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>)</li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSStatus</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSJavaEnum.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSJavaEnum</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node">DSIEnum</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node">DSIMetadata</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
+<li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordAes.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordAes</span></a> (implements org.iot.dsa.security.<a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
+<li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSPasswordSha256.html" title="class in org.iot.dsa.security"><span class="typeNameLink">DSPasswordSha256</span></a> (implements org.iot.dsa.security.<a href="org/iot/dsa/security/DSIPassword.html" title="interface in org.iot.dsa.security">DSIPassword</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
+<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSStatus.html" title="class in org.iot.dsa.node"><span class="typeNameLink">DSStatus</span></a> (implements org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node">DSIStatus</a>, org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node">DSIStorable</a>)</li>
 </ul>
 </li>
 <li type="circle">java.util.logging.Handler
 <ul>
-<li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">AsyncLogHandler</span></a>
+<li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/AsyncLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">AsyncLogHandler</span></a> (implements org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging">DSILevels</a>)
 <ul>
 <li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/FileLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">FileLogHandler</span></a></li>
 <li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/PrintStreamLogHandler.html" title="class in org.iot.dsa.logging"><span class="typeNameLink">PrintStreamLogHandler</span></a></li>
@@ -189,11 +198,12 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li type="circle">java.lang.RuntimeException
 <ul>
 <li type="circle">org.iot.dsa.util.<a href="org/iot/dsa/util/DSException.html" title="class in org.iot.dsa.util"><span class="typeNameLink">DSException</span></a></li>
-<li type="circle">org.iot.dsa.io.<a href="org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io"><span class="typeNameLink">DSIoException</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSInternalErrorException</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSRequestException</span></a>
 <ul>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSInvalidPathException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSInvalidPathException</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSPermissionException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSPermissionException</span></a></li>
+<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink"><span class="typeNameLink">DSUnsupportedException</span></a></li>
 </ul>
 </li>
 </ul>
@@ -232,6 +242,8 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 </li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIBoolean.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIBoolean</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIEnum.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIEnum</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">DSIEvent</span></a></li>
+<li type="circle">org.iot.dsa.logging.<a href="org/iot/dsa/logging/DSILevels.html" title="interface in org.iot.dsa.logging"><span class="typeNameLink">DSILevels</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIMetadata.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIMetadata</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSINumber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSINumber</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIObject.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIObject</span></a>
@@ -244,13 +256,12 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 </li>
 </ul>
 </li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIPublisher.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIPublisher</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIRequester.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSIRequester</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSIResponder.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSIResponder</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStatus.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIStatus</span></a></li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSISubscriber.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSISubscriber</span></a></li>
+<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIStorable.html" title="interface in org.iot.dsa.node"><span class="typeNameLink">DSIStorable</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSISubscriber.html" title="interface in org.iot.dsa.node.event"><span class="typeNameLink">DSISubscriber</span></a></li>
 <li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkConnection.Listener.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkConnection.Listener</span></a></li>
-<li type="circle">org.iot.dsa.dslink.<a href="org/iot/dsa/dslink/DSLinkSession.html" title="interface in org.iot.dsa.dslink"><span class="typeNameLink">DSLinkSession</span></a></li>
 <li type="circle">org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/InboundRequest.html" title="interface in org.iot.dsa.dslink.responder"><span class="typeNameLink">InboundRequest</span></a>
 <ul>
 <li type="circle">org.iot.dsa.dslink.responder.<a href="org/iot/dsa/dslink/responder/InboundInvokeRequest.html" title="interface in org.iot.dsa.dslink.responder"><span class="typeNameLink">InboundInvokeRequest</span></a> (also extends org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionInvocation.html" title="interface in org.iot.dsa.node.action">ActionInvocation</a>)</li>
@@ -277,12 +288,14 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
 <ul>
+<li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/ErrorType.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">ErrorType</span></a></li>
 <li type="circle">org.iot.dsa.dslink.requester.<a href="org/iot/dsa/dslink/requester/OutboundInvokeHandler.Mode.html" title="enum in org.iot.dsa.dslink.requester"><span class="typeNameLink">OutboundInvokeHandler.Mode</span></a></li>
 <li type="circle">org.iot.dsa.io.<a href="org/iot/dsa/io/DSIReader.Token.html" title="enum in org.iot.dsa.io"><span class="typeNameLink">DSIReader.Token</span></a></li>
 <li type="circle">org.iot.dsa.node.action.<a href="org/iot/dsa/node/action/ActionSpec.ResultType.html" title="enum in org.iot.dsa.node.action"><span class="typeNameLink">ActionSpec.ResultType</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSElementType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSElementType</span></a></li>
-<li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSIPublisher.Event.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSIPublisher.Event</span></a></li>
 <li type="circle">org.iot.dsa.node.<a href="org/iot/dsa/node/DSValueType.html" title="enum in org.iot.dsa.node"><span class="typeNameLink">DSValueType</span></a></li>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSInfoTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">DSInfoTopic.Event</span></a> (implements org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>)</li>
+<li type="circle">org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSValueTopic.Event.html" title="enum in org.iot.dsa.node.event"><span class="typeNameLink">DSValueTopic.Event</span></a> (implements org.iot.dsa.node.event.<a href="org/iot/dsa/node/event/DSIEvent.html" title="interface in org.iot.dsa.node.event">DSIEvent</a>)</li>
 <li type="circle">org.iot.dsa.security.<a href="org/iot/dsa/security/DSPermission.html" title="enum in org.iot.dsa.security"><span class="typeNameLink">DSPermission</span></a></li>
 <li type="circle">org.iot.dsa.time.<a href="org/iot/dsa/time/DSInterval.html" title="enum in org.iot.dsa.time"><span class="typeNameLink">DSInterval</span></a></li>
 </ul>
diff --git a/docs/javadoc/package-list b/docs/javadoc/package-list
index 33779ff3..45c7b2dc 100644
--- a/docs/javadoc/package-list
+++ b/docs/javadoc/package-list
@@ -4,10 +4,10 @@ org.iot.dsa.dslink.requester
 org.iot.dsa.dslink.responder
 org.iot.dsa.io
 org.iot.dsa.io.json
-org.iot.dsa.io.msgpack
 org.iot.dsa.logging
 org.iot.dsa.node
 org.iot.dsa.node.action
+org.iot.dsa.node.event
 org.iot.dsa.security
 org.iot.dsa.time
 org.iot.dsa.util
diff --git a/docs/javadoc/serialized-form.html b/docs/javadoc/serialized-form.html
index 451a85da..b0658eab 100644
--- a/docs/javadoc/serialized-form.html
+++ b/docs/javadoc/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_40) on Mon Nov 13 13:50:40 PST 2017 -->
-<title>Serialized Form (dslink-core 0.11.0 API)</title>
-<meta name="date" content="2017-11-13">
+<!-- Generated by javadoc (1.8.0_40) on Mon Mar 05 09:54:10 PST 2018 -->
+<title>Serialized Form (dslink-core 0.19.0 API)</title>
+<meta name="date" content="2018-03-05">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (dslink-core 0.11.0 API)";
+            parent.document.title="Serialized Form (dslink-core 0.19.0 API)";
         }
     }
     catch(err) {
@@ -76,6 +76,11 @@ <h1 title="Serialized Form" class="title">Serialized Form</h1>
 <li class="blockList">
 <h2 title="Package">Package&nbsp;org.iot.dsa.dslink</h2>
 <ul class="blockList">
+<li class="blockList"><a name="org.iot.dsa.dslink.DSInternalErrorException">
+<!--   -->
+</a>
+<h3>Class <a href="org/iot/dsa/dslink/DSInternalErrorException.html" title="class in org.iot.dsa.dslink">org.iot.dsa.dslink.DSInternalErrorException</a> extends java.lang.RuntimeException implements Serializable</h3>
+</li>
 <li class="blockList"><a name="org.iot.dsa.dslink.DSInvalidPathException">
 <!--   -->
 </a>
@@ -102,15 +107,10 @@ <h4>detail</h4>
 </li>
 </ul>
 </li>
-</ul>
-</li>
-<li class="blockList">
-<h2 title="Package">Package&nbsp;org.iot.dsa.io</h2>
-<ul class="blockList">
-<li class="blockList"><a name="org.iot.dsa.io.DSIoException">
+<li class="blockList"><a name="org.iot.dsa.dslink.DSUnsupportedException">
 <!--   -->
 </a>
-<h3>Class <a href="org/iot/dsa/io/DSIoException.html" title="class in org.iot.dsa.io">org.iot.dsa.io.DSIoException</a> extends java.lang.RuntimeException implements Serializable</h3>
+<h3>Class <a href="org/iot/dsa/dslink/DSUnsupportedException.html" title="class in org.iot.dsa.dslink">org.iot.dsa.dslink.DSUnsupportedException</a> extends <a href="org/iot/dsa/dslink/DSRequestException.html" title="class in org.iot.dsa.dslink">DSRequestException</a> implements Serializable</h3>
 </li>
 </ul>
 </li>
@@ -127,7 +127,7 @@ <h3>Serialized Fields</h3>
 <ul class="blockList">
 <li class="blockListLast">
 <h4>inner</h4>
-<pre>java.lang.Exception inner</pre>
+<pre>java.lang.Throwable inner</pre>
 </li>
 </ul>
 </li>
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSProtocolException.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSProtocolException.java
deleted file mode 100644
index 70b4d5e5..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSProtocolException.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.acuity.iot.dsa.dslink;
-
-import com.acuity.iot.dsa.dslink.protocol.message.ErrorResponse.Phase;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * For encoding errors at the protocol level.
- *
- * @author Aaron Hansen
- */
-public class DSProtocolException extends RuntimeException {
-
-    /////////////////////////////////////////////////////////////////
-    // Fields
-    /////////////////////////////////////////////////////////////////
-
-    private String detail;
-    private Phase phase = Phase.REQUEST;
-    private String type;
-
-    /////////////////////////////////////////////////////////////////
-    // Constructors
-    /////////////////////////////////////////////////////////////////
-
-    public DSProtocolException(String msg) {
-        super(msg);
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Public and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public Phase getPhase() {
-        return phase;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Optional.
-     */
-    public DSProtocolException setDetail(Throwable arg) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        arg.printStackTrace(pw);
-        pw.close();
-        detail = sw.toString();
-        return this;
-    }
-
-    /**
-     * Only needs called for responses, the default is request.
-     */
-    public DSProtocolException setPhase(Phase arg) {
-        phase = arg;
-        return this;
-    }
-
-    /**
-     * Optional.
-     */
-    public DSProtocolException setType(String arg) {
-        type = arg;
-        return this;
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Protected and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Package and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Private and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes - in alphabetical order by class name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Facets - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSResponderSession.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSResponderSession.java
deleted file mode 100644
index 6dc0f3c7..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSResponderSession.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.acuity.iot.dsa.dslink;
-
-import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import org.iot.dsa.dslink.DSLinkSession;
-
-/**
- * The session responders will use to submit responses.
- *
- * @author Aaron Hansen
- */
-public interface DSResponderSession extends DSLinkSession {
-
-    /**
-     * Append the message to the outgoing queue.
-     */
-    public void sendResponse(OutboundMessage res);
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSSession.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSSession.java
deleted file mode 100644
index 30682fe0..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSSession.java
+++ /dev/null
@@ -1,473 +0,0 @@
-package com.acuity.iot.dsa.dslink;
-
-import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1LinkConnection;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.iot.dsa.dslink.DSIRequester;
-import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.node.DSNode;
-
-/**
- * The state of a connection to a broker as well as a protocol implementation. Not intended for link
- * implementors.
- *
- * @author Aaron Hansen
- */
-public abstract class DSSession extends DSNode {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    static final int MAX_MSG_TIME = 3000;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private boolean active = false;
-    private DS1LinkConnection connection;
-    private long lastMessageSent;
-    private Logger logger;
-    private Object outgoingMutex = new Object();
-    private List<OutboundMessage> outgoingRequests = new LinkedList<OutboundMessage>();
-    private List<OutboundMessage> outgoingResponses = new LinkedList<OutboundMessage>();
-    private DSIReader reader;
-    protected boolean requesterAllowed = false;
-    private DSTransport transport;
-    private DSIWriter writer;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Prepare a new message.  After this is called, beginRequests and/beginResponses maybe called.
-     * When the message is complete, endMessage will be called.
-     *
-     * @see #beginRequests()
-     * @see #beginResponses()
-     * @see #endMessage()
-     */
-    protected abstract void beginMessage();
-
-    /**
-     * Prepare for the response portion of the message.  This will be followed by one or more calls
-     * to writeResponse().  When there are no more responses, endResponses() will be called.
-     *
-     * @see #writeResponse(OutboundMessage)
-     * @see #endResponses()
-     */
-    protected abstract void beginResponses();
-
-    /**
-     * Prepare for the request portion of the message.  This will be followed by one or more calls
-     * to writeRequest().  When there are no more responses, endRequests() will be called.
-     *
-     * @see #writeResponse(OutboundMessage)
-     * @see #endResponses()
-     */
-    protected abstract void beginRequests();
-
-    /**
-     * Can be called by the subclass to force exit the run method.
-     */
-    public void close() {
-        try {
-            active = false;
-            synchronized (outgoingMutex) {
-                outgoingRequests.clear();
-                outgoingResponses.clear();
-                outgoingMutex.notify();
-            }
-        } catch (Exception x) {
-            fine(connection.getConnectionId(), x);
-        }
-    }
-
-    /**
-     * The protocol implementation should read messages and do something with them. The
-     * implementation should call isOpen() to determine when to exit this method.
-     *
-     * @see #isOpen()
-     */
-    protected abstract void doRead() throws IOException;
-
-    /**
-     * The run method thread spawns a thread which then executes this method for writing outgoing
-     * requests and responses.
-     */
-    private void doWrite() {
-        long endTime;
-        boolean requestsFirst = false;
-        DSTransport transport = getTransport();
-        lastMessageSent = System.currentTimeMillis();
-        DSIWriter writer = getWriter();
-        try {
-            while (active) {
-                synchronized (outgoingMutex) {
-                    if (!hasSomethingToSend()) {
-                        try {
-                            outgoingMutex.wait(1000);
-                        } catch (InterruptedException ignore) {
-                        }
-                        continue;
-                    }
-                }
-                endTime = System.currentTimeMillis() + MAX_MSG_TIME;
-                //alternate the send requests or responses first each time
-                writer.reset();
-                requestsFirst = !requestsFirst;
-                transport.beginMessage();
-                beginMessage();
-                if (hasMessagesToSend()) {
-                    send(requestsFirst, endTime);
-                    if (active &&
-                            (System.currentTimeMillis() < endTime) &&
-                            !transport.shouldEndMessage()) {
-                        send(!requestsFirst, endTime);
-                    }
-                }
-                endMessage();
-                transport.endMessage();
-                lastMessageSent = System.currentTimeMillis();
-            }
-        } catch (Exception x) {
-            if (active) {
-                getLogger().log(Level.FINE, getConnection().getConnectionId(), x);
-                active = false;
-                transport.close();
-            }
-        }
-    }
-
-    /**
-     * Complete the message.
-     */
-    protected abstract void endMessage();
-
-    /**
-     * Complete the outgoing responses part of the message.
-     *
-     * @see #beginResponses()
-     * @see #writeResponse(OutboundMessage)
-     */
-    protected abstract void endResponses();
-
-    /**
-     * Complete the outgoing requests part of the message.
-     *
-     * @see #beginRequests()
-     * @see #writeRequest(OutboundMessage)
-     */
-    protected abstract void endRequests();
-
-    /**
-     * Can return null.
-     */
-    private OutboundMessage dequeueOutgoingResponse() {
-        synchronized (outgoingMutex) {
-            if (!outgoingResponses.isEmpty()) {
-                return outgoingResponses.remove(0);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Can return null.
-     */
-    private OutboundMessage dequeueOutgoingRequest() {
-        synchronized (outgoingMutex) {
-            if (!outgoingRequests.isEmpty()) {
-                return outgoingRequests.remove(0);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Add a message to the outgoing request queue.
-     */
-    public void enqueueOutgoingRequest(OutboundMessage arg) {
-        if (active) {
-            if (!requesterAllowed) {
-                throw new IllegalStateException("Requests forbidden");
-            }
-            synchronized (outgoingMutex) {
-                outgoingRequests.add(arg);
-                outgoingMutex.notify();
-            }
-        }
-    }
-
-    /**
-     * Add a message to the outgoing response queue.
-     */
-    public void enqueueOutgoingResponse(OutboundMessage arg) {
-        if (active) {
-            synchronized (outgoingMutex) {
-                outgoingResponses.add(arg);
-                outgoingMutex.notify();
-            }
-        }
-    }
-
-    public DS1LinkConnection getConnection() {
-        return connection;
-    }
-
-    /**
-     * The time the lastRun message was completed.
-     */
-    protected long getLastMessageSent() {
-        return lastMessageSent;
-    }
-
-    @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(getConnection().getLink().getLinkName() + ".session");
-        }
-        return logger;
-    }
-
-    protected DSIReader getReader() {
-        if ((reader == null) && (transport != null)) {
-            setReader(transport.getReader());
-        }
-        return reader;
-    }
-
-    protected abstract DSIRequester getRequester();
-
-    protected DSTransport getTransport() {
-        return transport;
-    }
-
-    protected DSIWriter getWriter() {
-        if ((writer == null) && (transport != null)) {
-            setWriter(transport.getWriter());
-        }
-        return writer;
-    }
-
-    /**
-     * True if there are outbound messages on the queue.
-     */
-    protected final boolean hasMessagesToSend() {
-        if (!outgoingResponses.isEmpty()) {
-            return true;
-        }
-        if (!outgoingRequests.isEmpty()) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Override point, this returns the result of hasMessagesToSend.
-     */
-    protected boolean hasSomethingToSend() {
-        return hasMessagesToSend();
-    }
-
-    /**
-     * The subclass check this to determine when to exit the doRun method.
-     *
-     * @see #doRead()
-     */
-    protected boolean isOpen() {
-        return active && transport.isOpen();
-    }
-
-    /**
-     * Can be used to waking up a sleeping writer.
-     */
-    protected void notifyOutgoing() {
-        synchronized (outgoingMutex) {
-            outgoingMutex.notify();
-        }
-    }
-
-    /**
-     * Override point, called when the previous connection can be resumed. The the transport will
-     * have already been set.
-     */
-    public void onConnect() {
-        active = true;
-    }
-
-    /**
-     * Override point, when a connection attempt failed.
-     */
-    public void onConnectFail() {
-    }
-
-    /**
-     * Override point, the connection was closed.
-     */
-    public void onDisconnect() {
-        active = false;
-    }
-
-    /**
-     * Called when the broker signifies that requests are allowed.
-     */
-    public void setRequesterAllowed() {
-        requesterAllowed = true;
-    }
-
-    /**
-     * Called by the connection, this manages the running state and calls doRun for the specific
-     * implementation.  A separate thread is spun off to manage writing.
-     *
-     * @see #doRead()
-     */
-    public void run() {
-        new WriteThread(getConnection().getLink().getLinkName() + " Writer").start();
-        try {
-            doRead();
-        } catch (Exception x) {
-            if (active) {
-                fine(getConnection().getConnectionId(), x);
-            }
-        }
-    }
-
-    /**
-     * Send messages from one of the queues.
-     *
-     * @param requests Determines which queue to use; True for outgoing requests, false for
-     *                 responses.
-     * @param endTime  Stop after this time.
-     */
-    private void send(boolean requests, long endTime) {
-        if (requests) {
-            if (outgoingRequests.isEmpty()) {
-                return;
-            }
-            beginRequests();
-        } else {
-            if (outgoingResponses.isEmpty()) {
-                return;
-            }
-            beginResponses();
-        }
-        OutboundMessage msg = requests ? dequeueOutgoingRequest() : dequeueOutgoingResponse();
-        DSTransport transport = getTransport();
-        while ((msg != null) && (System.currentTimeMillis() < endTime)) {
-            if (requests) {
-                writeRequest(msg);
-            } else {
-                writeResponse(msg);
-            }
-            if (!transport.shouldEndMessage()) {
-                msg = requests ? dequeueOutgoingRequest() : dequeueOutgoingResponse();
-            } else {
-                msg = null;
-            }
-        }
-        if (requests) {
-            endRequests();
-        } else {
-            endResponses();
-        }
-    }
-
-    /**
-     * Called when there are no outbound messages in the queue.  Can be used for pinging and acks.
-     *
-     * @return True to send a message anyway.
-     */
-    protected boolean sendEmptyMessage() {
-        return false;
-    }
-
-    /**
-     * For use by the connection object.
-     */
-    public DSSession setConnection(DS1LinkConnection connection) {
-        this.connection = connection;
-        return this;
-    }
-
-    /**
-     * For use by the connection object.
-     */
-    public DSSession setReader(DSIReader reader) {
-        this.reader = reader;
-        return this;
-    }
-
-    /**
-     * For use by the connection object.
-     */
-    public DSSession setTransport(DSTransport transport) {
-        this.transport = transport;
-        return this;
-    }
-
-    /**
-     * For use by the connection object.
-     */
-    public DSSession setWriter(DSIWriter writer) {
-        this.writer = writer;
-        return this;
-    }
-
-    /**
-     * Write a request in the current message. Can be called multiple times after beginRequests() is
-     * called.  endRequests() will be called once the request part of the message is complete.
-     *
-     * @see #beginRequests()
-     * @see #endRequests()
-     */
-    public void writeRequest(OutboundMessage message) {
-        message.write(getWriter());
-    }
-
-    /**
-     * Write a response in the current message. Can be called multiple times after beginResponses()
-     * is called.  endResponses() will be called once the response part of the message is complete.
-     *
-     * @see #beginResponses()
-     * @see #endResponses()
-     */
-    public void writeResponse(OutboundMessage message) {
-        message.write(getWriter());
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * A separate thread is used for writing to the connection.
-     */
-    private class WriteThread extends Thread {
-
-        WriteThread(String name) {
-            super(name);
-            setDaemon(true);
-        }
-
-        public void run() {
-            doWrite();
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-} //class
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/Template.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/Template.java
index e8546191..4e3b8b4a 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/Template.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/Template.java
@@ -9,28 +9,22 @@
  */
 public class Template extends DSLogger {
 
-    ///////////////////////////////////////////////////////////////////////////
     // Constants
-    ///////////////////////////////////////////////////////////////////////////
+    // ---------
 
-    ///////////////////////////////////////////////////////////////////////////
     // Fields
-    ///////////////////////////////////////////////////////////////////////////
+    // ------
 
-    ///////////////////////////////////////////////////////////////////////////
     // Constructors
-    ///////////////////////////////////////////////////////////////////////////
+    // ------------
 
-    ///////////////////////////////////////////////////////////////////////////
     // Methods
-    ///////////////////////////////////////////////////////////////////////////
+    // -------
 
-    ///////////////////////////////////////////////////////////////////////////
     // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
+    // -------------
 
-    ///////////////////////////////////////////////////////////////////////////
     // Initialization
-    ///////////////////////////////////////////////////////////////////////////
+    // --------------
 
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java
new file mode 100644
index 00000000..295d3125
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSByteBuffer.java
@@ -0,0 +1,603 @@
+package com.acuity.iot.dsa.dslink.io;
+
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.nio.ByteBuffer;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.util.DSException;
+
+/**
+ * A buffer for storing bytes being pushed from an input stream.  Useful when bytes are
+ * coming in faster than can be processed.  This is not synchronized.
+ *
+ * @author Aaron Hansen
+ */
+public class DSByteBuffer extends InputStream {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private byte[] buffer;
+    private int length = 0;
+    private int offset = 0;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - Constructors
+    /////////////////////////////////////////////////////////////////
+
+    public DSByteBuffer() {
+        this(8192);
+    }
+
+    public DSByteBuffer(int initialCapacity) {
+        buffer = new byte[initialCapacity];
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    /**
+     * Number of bytes available for reading.
+     */
+    public int available() {
+        return length;
+    }
+
+    public DSByteBuffer clear() {
+        length = 0;
+        offset = 0;
+        return this;
+    }
+
+    /**
+     * Increases the childCount of the buffer to at least the given.
+     */
+    private void growBuffer(int minSize) {
+        int size = buffer.length;
+        while (size < minSize) {
+            size *= 2;
+        }
+        byte[] tmp = new byte[size];
+        System.arraycopy(buffer, offset, tmp, 0, length);
+        buffer = tmp;
+        offset = 0;
+    }
+
+    /**
+     * Number of bytes available for reading.
+     */
+    public int length() {
+        return length;
+    }
+
+    /**
+     * Prints the current contents of the buffer, doesn't modify it in any way.
+     */
+    public void print(PrintStream out, int cols) {
+        StringBuilder buf = new StringBuilder();
+        int buflen;
+        for (int i = offset, len = offset + length; i < len; i++) {
+            buflen = buf.length();
+            if ((buflen + 3) > cols) {
+                out.println(buf.toString());
+                buf.setLength(0);
+            }
+            if (buflen > 0) {
+                buf.append(' ');
+            }
+            DSBytes.toHex(buffer[i], buf);
+        }
+        if (buf.length() > 0) {
+            out.println(buf.toString());
+        }
+    }
+
+    /**
+     * /**
+     * Gets the bytes from the given buffer, which will be flipped, then cleared.
+     */
+    public DSByteBuffer put(ByteBuffer buf) {
+        int pos = buf.position();
+        int bufLen = buffer.length;
+        if ((pos + length + offset) >= bufLen) {
+            if ((pos + length) > bufLen) {  //the buffer is too small
+                growBuffer(pos + length);
+            } else { //offset must be > 0, shift everything to index 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        buf.flip();
+        buf.get(buffer, length + offset, pos);
+        buf.clear();
+        length += pos;
+        return this;
+    }
+
+    /**
+     * Add the byte to the buffer for reading.
+     */
+    public DSByteBuffer put(byte b) {
+        int bufLen = buffer.length;
+        int msgLen = 1;
+        if ((msgLen + length + offset) >= bufLen) {
+            if ((msgLen + length) > bufLen) {
+                growBuffer(msgLen + length);
+            } else { //offset must be > 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        buffer[length + offset] = b;
+        length++;
+        return this;
+    }
+
+    /**
+     * Add the byte to the buffer for reading.
+     */
+    public DSByteBuffer put(byte b1, byte b2) {
+        int bufLen = buffer.length;
+        int msgLen = 2;
+        if ((msgLen + length + offset) >= bufLen) {
+            if ((msgLen + length) > bufLen) {
+                growBuffer(msgLen + length);
+            } else { //offset must be > 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        int idx = length + offset;
+        buffer[idx] = b1;
+        buffer[++idx] = b2;
+        length += msgLen;
+        return this;
+    }
+
+    /**
+     * Add the byte to the buffer for reading.
+     */
+    public DSByteBuffer put(byte b1, byte b2, byte b3, byte b4) {
+        int bufLen = buffer.length;
+        int msgLen = 4;
+        if ((msgLen + length + offset) >= bufLen) {
+            if ((msgLen + length) > bufLen) {
+                growBuffer(msgLen + length);
+            } else { //offset must be > 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        int idx = length + offset;
+        buffer[idx] = b1;
+        buffer[++idx] = b2;
+        buffer[++idx] = b3;
+        buffer[++idx] = b4;
+        length += msgLen;
+        return this;
+    }
+
+    /**
+     * Add the byte to the buffer for reading.
+     */
+    public DSByteBuffer put(byte b1, byte b2, byte b3, byte b4, byte b5, byte b6, byte b7,
+                            byte b8) {
+        int bufLen = buffer.length;
+        int msgLen = 8;
+        if ((msgLen + length + offset) >= bufLen) {
+            if ((msgLen + length) > bufLen) {
+                growBuffer(msgLen + length);
+            } else { //offset must be > 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        int idx = length + offset;
+        buffer[idx] = b1;
+        buffer[++idx] = b2;
+        buffer[++idx] = b3;
+        buffer[++idx] = b4;
+        buffer[++idx] = b5;
+        buffer[++idx] = b6;
+        buffer[++idx] = b7;
+        buffer[++idx] = b8;
+        length += msgLen;
+        return this;
+    }
+
+    /**
+     * Add bytes to the buffer for reading.
+     *
+     * @param msg The data source.
+     */
+    public DSByteBuffer put(byte[] msg) {
+        return put(msg, 0, msg.length);
+    }
+
+    /**
+     * Add bytes to the buffer for reading.
+     *
+     * @param msg The data source.
+     * @param off The start offset in the buffer to put data.
+     * @param len The maximum number of bytes to read.
+     */
+    public DSByteBuffer put(byte[] msg, int off, int len) {
+        int bufLen = buffer.length;
+        if ((len + length + offset) >= bufLen) {
+            if ((len + length) > bufLen) {  //the buffer is too small
+                growBuffer(len + length);
+            } else { //offset must be > 0, shift everything to index 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        System.arraycopy(msg, off, buffer, length + offset, len);
+        length += len;
+        return this;
+    }
+
+    /**
+     * Overwrite bytes in the internal buffer (which begins at index 0).
+     *
+     * @param dest The internal destination offset.
+     * @param msg  The data source.
+     * @param off  The start offset in the msg to put data.
+     * @param len  The maximum number of bytes to put.
+     */
+    public DSByteBuffer put(int dest, byte[] msg, int off, int len) {
+        if (offset > 0) {
+            System.arraycopy(buffer, offset, buffer, 0, length);
+            offset = 0;
+        }
+        int newLen = dest + len;
+        if (newLen >= buffer.length) {
+            growBuffer(newLen);
+        }
+        System.arraycopy(msg, off, buffer, dest, len);
+        if (newLen > length) {
+            length = newLen;
+        }
+        if ((dest + len) > length) {
+            length += len;
+        }
+        return this;
+    }
+
+    public int put(InputStream in, int len) {
+        growBuffer(offset + len);
+        try {
+            len = in.read(buffer, offset, len);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        length += len;
+        return len;
+    }
+
+    /**
+     * Encodes the primitive into buffer using big endian encoding.
+     */
+    public DSByteBuffer putDouble(double v) {
+        return putDouble(v, true);
+    }
+
+    /**
+     * Encodes the primitive into the buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putDouble(double v, boolean bigEndian) {
+        return putLong(Double.doubleToRawLongBits(v), bigEndian);
+    }
+
+    /**
+     * Encodes the primitive into buffer using big endian encoding.
+     */
+    public DSByteBuffer putFloat(float v) {
+        return putFloat(v, true);
+    }
+
+    /**
+     * Encodes the primitive into the buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putFloat(float v, boolean bigEndian) {
+        return putInt(Float.floatToIntBits(v), bigEndian);
+    }
+
+    /**
+     * Encodes the primitive into buffer using big endian encoding.
+     */
+    public DSByteBuffer putInt(int v) {
+        return putInt(v, true);
+    }
+
+    /**
+     * Encodes the primitive into buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putInt(int v, boolean bigEndian) {
+        if (bigEndian) {
+            return put((byte) ((v >>> 24) & 0xFF),
+                       (byte) ((v >>> 16) & 0xFF),
+                       (byte) ((v >>> 8) & 0xFF),
+                       (byte) ((v >>> 0) & 0xFF));
+        }
+        return put((byte) ((v >>> 0) & 0xFF),
+                   (byte) ((v >>> 8) & 0xFF),
+                   (byte) ((v >>> 16) & 0xFF),
+                   (byte) ((v >>> 24) & 0xFF));
+    }
+
+    /**
+     * Encodes the primitive into the buffer using big endian encoding.
+     */
+    public DSByteBuffer putLong(long v) {
+        return putLong(v, true);
+    }
+
+    /**
+     * Encodes the primitive into the buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putLong(long v, boolean bigEndian) {
+        if (bigEndian) {
+            return put((byte) (v >>> 56),
+                       (byte) (v >>> 48),
+                       (byte) (v >>> 40),
+                       (byte) (v >>> 32),
+                       (byte) (v >>> 24),
+                       (byte) (v >>> 16),
+                       (byte) (v >>> 8),
+                       (byte) (v >>> 0));
+        }
+        return put((byte) (v >>> 0),
+                   (byte) (v >>> 8),
+                   (byte) (v >>> 16),
+                   (byte) (v >>> 24),
+                   (byte) (v >>> 32),
+                   (byte) (v >>> 40),
+                   (byte) (v >>> 48),
+                   (byte) (v >>> 56));
+    }
+
+    /**
+     * Encodes the primitive into the buffer using big endian.
+     */
+    public DSByteBuffer putShort(short v) {
+        return putShort(v, true);
+    }
+
+    /**
+     * Encodes the primitive into the buffer.
+     *
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer putShort(short v, boolean bigEndian) {
+        if (bigEndian) {
+            return put((byte) ((v >>> 8) & 0xFF), (byte) ((v >>> 0) & 0xFF));
+        }
+        return put((byte) ((v >>> 0) & 0xFF), (byte) ((v >>> 8) & 0xFF));
+    }
+
+    /**
+     * Returns the next byte in the buffer, or -1 when nothing is available.
+     */
+    public int read() {
+        if (length == 0) {
+            return -1;
+        }
+        int ret = buffer[offset];
+        offset++;
+        length--;
+        return ret;
+    }
+
+    /**
+     * Overwrites byte in the internal buffer.
+     *
+     * @param dest The logical offset in the internal buffer to write the byte.
+     */
+    public DSByteBuffer replace(int dest, byte b1) {
+        if (offset > 0) {
+            System.arraycopy(buffer, offset, buffer, 0, length);
+            offset = 0;
+        }
+        buffer[dest] = b1;
+        return this;
+    }
+
+    /**
+     * Overwrites bytes in the internal buffer.
+     *
+     * @param dest The logical offset in the internal buffer to write the bytes.
+     */
+    public DSByteBuffer replace(int dest, byte b1, byte b2) {
+        if (offset > 0) {
+            System.arraycopy(buffer, offset, buffer, 0, length);
+            offset = 0;
+        }
+        if ((dest + 2) > length) {
+            throw new IllegalArgumentException("Replace cannot grow the buffer");
+        }
+        buffer[dest] = b1;
+        buffer[++dest] = b2;
+        return this;
+    }
+
+    /**
+     * Overwrites bytes in the internal buffer.
+     *
+     * @param dest The logical offset in the internal buffer to write the bytes.
+     */
+    public DSByteBuffer replace(int dest, byte b1, byte b2, byte b3, byte b4) {
+        if (offset > 0) {
+            System.arraycopy(buffer, offset, buffer, 0, length);
+            offset = 0;
+        }
+        if ((dest + 4) > length) {
+            throw new IllegalArgumentException("Replace cannot grow the buffer");
+        }
+        buffer[dest] = b1;
+        buffer[++dest] = b2;
+        buffer[++dest] = b3;
+        buffer[++dest] = b4;
+        return this;
+    }
+
+    /**
+     * Overwrites the primitive in the internal buffer.  Does not change the buffer length or
+     * position.
+     *
+     * @param dest      The logical offset in the internal buffer to write the bytes.
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer replaceInt(int dest, int v, boolean bigEndian) {
+        if (bigEndian) {
+            return replace(dest, (byte) ((v >>> 24) & 0xFF),
+                           (byte) ((v >>> 16) & 0xFF),
+                           (byte) ((v >>> 8) & 0xFF),
+                           (byte) ((v >>> 0) & 0xFF));
+        }
+        return replace(dest, (byte) ((v >>> 0) & 0xFF),
+                       (byte) ((v >>> 8) & 0xFF),
+                       (byte) ((v >>> 16) & 0xFF),
+                       (byte) ((v >>> 24) & 0xFF));
+    }
+
+    /**
+     * Overwrites the primitive in the internal buffer.  Does not change the buffer length or*
+     * position.
+     *
+     * @param dest      The offset in the internal buffer to write the bytes.
+     * @param v         The value to encode.
+     * @param bigEndian Whether to encode in big or little endian byte ordering.
+     */
+    public DSByteBuffer replaceShort(int dest, short v, boolean bigEndian) {
+        if (bigEndian) {
+            return replace(dest, (byte) ((v >>> 8) & 0xFF), (byte) ((v >>> 0) & 0xFF));
+        }
+        return replace(dest, (byte) ((v >>> 0) & 0xFF), (byte) ((v >>> 8) & 0xFF));
+    }
+
+    /**
+     * Push bytes from the internal buffer to the given buffer.
+     *
+     * @param buf The buffer into which data is read.
+     * @param off The start offset in the buffer to put data.
+     * @param len The maximum number of bytes to read.
+     * @return The number of bytes read.
+     */
+    public int sendTo(byte[] buf, int off, int len) {
+        if (length == 0) {
+            return 0;
+        }
+        len = Math.min(len, length);
+        System.arraycopy(buffer, offset, buf, off, len);
+        length -= len;
+        if (length == 0) {
+            offset = 0;
+        } else {
+            offset += len;
+        }
+        return len;
+    }
+
+    /**
+     * Push bytes from the internal buffer to the given buffer.
+     *
+     * @param buf The buffer into which data is read.
+     * @return The number of bytes read.
+     */
+    public int sendTo(ByteBuffer buf) {
+        if (length == 0) {
+            return 0;
+        }
+        int len = Math.min(buf.remaining(), length);
+        buf.put(buffer, offset, len);
+        length -= len;
+        if (length == 0) {
+            offset = 0;
+        } else {
+            offset += len;
+        }
+        return len;
+    }
+
+    /**
+     * Push bytes from the internal buffer to the transport.
+     */
+    public void sendTo(DSBinaryTransport transport, boolean isLast) {
+        transport.write(buffer, offset, length, isLast);
+        offset = 0;
+        length = 0;
+    }
+
+    /**
+     * Push bytes from the internal buffer to the given.
+     */
+    public void sendTo(DSByteBuffer buf, int len) {
+        buf.put(buffer, offset, len);
+        length -= len;
+        if (length == 0) {
+            offset = 0;
+        } else {
+            offset += len;
+        }
+    }
+
+    /**
+     * Push bytes from the internal buffer to the stream.
+     */
+    public void sendTo(OutputStream out) {
+        if (length == 0) {
+            return;
+        }
+        try {
+            out.write(buffer, offset, length);
+            offset = 0;
+            length = 0;
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    /**
+     * Skip forward some bytes, usually to be replaced later.
+     */
+    public void skip(int len) {
+        int bufLen = buffer.length;
+        if ((len + length + offset) >= bufLen) {
+            if ((len + length) > bufLen) {
+                growBuffer(len + length);
+            } else { //offset must be > 0
+                System.arraycopy(buffer, offset, buffer, 0, length);
+                offset = 0;
+            }
+        }
+        length += len;
+    }
+
+    /**
+     * Returns a new array.
+     */
+    public byte[] toByteArray() {
+        byte[] ret = new byte[length];
+        sendTo(ret, 0, length);
+        return ret;
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/DSCharBuffer.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSCharBuffer.java
similarity index 85%
rename from dslink-core/src/main/java/org/iot/dsa/io/DSCharBuffer.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSCharBuffer.java
index fea0bdd3..678ef944 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/DSCharBuffer.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSCharBuffer.java
@@ -1,22 +1,19 @@
-package org.iot.dsa.io;
+package com.acuity.iot.dsa.dslink.io;
 
 /**
- * A buffer for storing chars being pushed from a reader.  Useful when chars are coming in faster
- * than can be processed.
+ * A buffer for storing chars being pushed from a reader.  Useful when chars are coming
+ * in faster than can be processed.
  *
  * @author Aaron Hansen
  */
 public class DSCharBuffer {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
     private char[] buffer;
+    private RuntimeException closeException;
     private int length = 0;
     private int offset = 0;
     private boolean open = false;
@@ -45,6 +42,12 @@ public int available() {
         return length;
     }
 
+    public synchronized void clear() {
+        length = 0;
+        offset = 0;
+        notify();
+    }
+
     /**
      * Important for notifying waiting threads.
      */
@@ -56,6 +59,18 @@ public synchronized void close() {
         notify();
     }
 
+    /**
+     * Important for notifying waiting threads.
+     */
+    public synchronized void close(RuntimeException toThrow) {
+        if (!open) {
+            return;
+        }
+        closeException = toThrow;
+        open = false;
+        notify();
+    }
+
     /**
      * Number of millis the read methods will block before throwing an IOException.
      *
@@ -87,7 +102,10 @@ public synchronized void open() {
         if (open) {
             return;
         }
+        length = 0;
+        offset = 0;
         open = true;
+        closeException = null;
         notify();
     }
 
@@ -96,7 +114,7 @@ public synchronized void open() {
      */
     public synchronized void put(char b) {
         if (!open) {
-            throw new IllegalStateException("Buffer closed");
+            throw new DSIoException("Closed");
         }
         int bufLen = buffer.length;
         int msgLen = 1;
@@ -131,7 +149,7 @@ public synchronized void put(char[] msg) {
      */
     public synchronized void put(char[] msg, int off, int len) {
         if (!open) {
-            throw new IllegalStateException("Buffer closed");
+            throw new DSIoException("Closed");
         }
         int bufLen = buffer.length;
         if ((len + length + offset) >= bufLen) {
@@ -153,7 +171,7 @@ public synchronized void put(char[] msg, int off, int len) {
      */
     public synchronized void put(String msg) {
         if (!open) {
-            throw new IllegalStateException("Buffer closed");
+            throw new DSIoException("Closed");
         }
         int len = msg.length();
         int bufLen = buffer.length;
@@ -188,7 +206,12 @@ public synchronized int read() {
         }
         notify();
         if (!open) {
-            return -1;
+            if (length == 0) {
+                if (closeException != null) {
+                    throw closeException;
+                }
+                return -1;
+            }
         } else if (length == 0) {
             throw new DSIoException("Read timeout");
         }
@@ -220,7 +243,12 @@ public synchronized int read(char[] buf, int off, int len) {
         }
         notify();
         if (!open) {
-            return -1;
+            if (length == 0) {
+                if (closeException != null) {
+                    throw closeException;
+                }
+                return -1;
+            }
         } else if (length == 0) {
             throw new DSIoException("Read timeout");
         }
@@ -246,12 +274,4 @@ public DSCharBuffer setTimeout(long timeout) {
         return this;
     }
 
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/DSIoException.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSIoException.java
similarity index 83%
rename from dslink-core/src/main/java/org/iot/dsa/io/DSIoException.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSIoException.java
index 42d01d7e..cff04ded 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/DSIoException.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/DSIoException.java
@@ -1,4 +1,4 @@
-package org.iot.dsa.io;
+package com.acuity.iot.dsa.dslink.io;
 
 /**
  * Unchecked IOException.
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackConstants.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackConstants.java
similarity index 95%
rename from dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackConstants.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackConstants.java
index babebe7a..e2bbf8b1 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackConstants.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackConstants.java
@@ -1,4 +1,4 @@
-package org.iot.dsa.io.msgpack;
+package com.acuity.iot.dsa.dslink.io.msgpack;
 
 /**
  * @author Aaron Hansen
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackReader.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackReader.java
similarity index 96%
rename from dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackReader.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackReader.java
index 28c618ce..196d8a9c 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackReader.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackReader.java
@@ -1,4 +1,4 @@
-package org.iot.dsa.io.msgpack;
+package com.acuity.iot.dsa.dslink.io.msgpack;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,7 +41,6 @@ public MsgpackReader(InputStream in) {
         setInput(in);
     }
 
-
     // Public Methods
     // --------------
 
@@ -316,13 +315,17 @@ private Token readString(byte b) throws IOException {
                     throw new IllegalStateException("Unknown string type: " + b);
             }
         }
-        byte[] bytes = readBytes(size);
-        ByteBuffer byteBuf = getByteBuffer(bytes, 0, size);
-        CharBuffer charBuf = getCharBuffer(size);
+        setNextValue(readUTF(size));
+        return last();
+    }
+
+    public String readUTF(int len) throws IOException {
+        byte[] bytes = readBytes(len);
+        ByteBuffer byteBuf = getByteBuffer(bytes, 0, len);
+        CharBuffer charBuf = getCharBuffer(len);
         decoder.decode(byteBuf, charBuf, false);
         charBuf.flip();
-        setNextValue(charBuf.toString());
-        return last();
+        return charBuf.toString();
     }
 
     // Inner Classes
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackWriter.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackWriter.java
similarity index 80%
rename from dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackWriter.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackWriter.java
index c1a4dd1a..d8878b81 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/msgpack/MsgpackWriter.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/io/msgpack/MsgpackWriter.java
@@ -1,5 +1,7 @@
-package org.iot.dsa.io.msgpack;
+package com.acuity.iot.dsa.dslink.io.msgpack;
 
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -12,12 +14,12 @@
 /**
  * @author Aaron Hansen
  */
-public abstract class MsgpackWriter extends AbstractWriter implements MsgpackConstants {
+public class MsgpackWriter extends AbstractWriter implements MsgpackConstants {
 
     // Fields
     // ------
 
-    private ByteBuffer byteBuffer = ByteBuffer.allocate(1024 * 64);
+    protected DSByteBuffer byteBuffer = new DSByteBuffer();
     private CharBuffer charBuffer;
     private Frame frame;
     private CharsetEncoder encoder = DSString.UTF8.newEncoder();
@@ -26,9 +28,31 @@ public abstract class MsgpackWriter extends AbstractWriter implements MsgpackCon
     // Constructors
     // ------------
 
+    public MsgpackWriter() {
+    }
+
+    public MsgpackWriter(DSByteBuffer buffer) {
+        this.byteBuffer = buffer;
+    }
+
     // Methods
     // -------
 
+    /**
+     * Does nothing.
+     */
+    @Override
+    public void close() {
+    }
+
+    /**
+     * Does nothing.
+     */
+    @Override
+    public MsgpackWriter flush() {
+        return this;
+    }
+
     /**
      * Used by writeString(), returns the string wrapped in a charbuffer that is ready for reading
      * (getting).  Attempts to reuse the same buffer as much as possible.
@@ -78,6 +102,23 @@ private ByteBuffer getStringBuffer(int len) {
         return strBuffer;
     }
 
+    /**
+     * Returns the number of bytes in the outgoing byte buffer.
+     */
+    public int length() {
+        return byteBuffer.length();
+    }
+
+    /**
+     * Callback, for when the top level container is finished.
+     */
+    public void onComplete() {
+    }
+
+    public byte[] toByteArray() {
+        return byteBuffer.toByteArray();
+    }
+
     @Override
     protected void writeSeparator() throws IOException {
     }
@@ -107,12 +148,10 @@ protected void write(byte[] arg) throws IOException {
         if (len < (1 << 8)) {
             byteBuffer.put(BIN8);
             byteBuffer.put((byte) len);
-        }
-        else if (len < (1 << 16)) {
+        } else if (len < (1 << 16)) {
             byteBuffer.put(BIN16);
             byteBuffer.putShort((short) len);
-        }
-        else {
+        } else {
             byteBuffer.put(BIN32);
             byteBuffer.putInt(len);
         }
@@ -188,18 +227,14 @@ protected void writeListEnd() throws IOException {
         frame.writeSize();
         frame = frame.parent;
         if (frame == null) {
-            flush();
+            onComplete();
         }
     }
 
-    @Override
-    protected void writeListStart() throws IOException {
-        writeListStart(-1);
-    }
-
     /**
      * A negative size implies dynamic and will be written when the list is closed.
      */
+    @Override
     protected void writeListStart(int len) throws IOException {
         if (frame != null) {
             frame.increment();
@@ -207,7 +242,7 @@ protected void writeListStart(int len) throws IOException {
         this.frame = new Frame(true);
         if (len < 0) {
             byteBuffer.put(LIST16);
-            frame.offset = byteBuffer.position();
+            frame.offset = byteBuffer.length();
             byteBuffer.putShort((short) 0);
         } else if (len < (1 << 4)) {
             byteBuffer.put((byte) (FIXLIST_PREFIX | len));
@@ -225,18 +260,14 @@ protected void writeMapEnd() throws IOException {
         frame.writeSize();
         frame = frame.parent;
         if (frame == null) {
-            flush();
+            onComplete();
         }
     }
 
-    @Override
-    protected void writeMapStart() throws IOException {
-        writeMapStart(-1);
-    }
-
     /**
      * A negative size implies dynamic and will be written when the map is closed.
      */
+    @Override
     protected void writeMapStart(int len) throws IOException {
         if (frame != null) {
             frame.increment();
@@ -244,7 +275,7 @@ protected void writeMapStart(int len) throws IOException {
         this.frame = new Frame(true);
         if (len < 0) {
             byteBuffer.put(MAP16);
-            frame.offset = byteBuffer.position();
+            frame.offset = byteBuffer.length();
             byteBuffer.putShort((short) 0);
         } else if (len < (1 << 4)) {
             byteBuffer.put((byte) (FIXMAP_PREFIX | len));
@@ -269,8 +300,7 @@ private void writeString(CharSequence arg) throws IOException {
         CharBuffer chars = getCharBuffer(arg);
         ByteBuffer strBuffer = getStringBuffer(chars.position() * (int) encoder.maxBytesPerChar());
         encoder.encode(chars, strBuffer, false);
-        strBuffer.flip();
-        int len = strBuffer.remaining();
+        int len = strBuffer.position();
         if (len < (1 << 5)) {
             byteBuffer.put((byte) (FIXSTR_PREFIX | len));
         } else if (len < (1 << 8)) {
@@ -290,10 +320,15 @@ private void writeString(CharSequence arg) throws IOException {
     /**
      * Writes the internal buffer to the parameter.  The internal buffer will be cleared.
      */
-    protected void writeTo(ByteBuffer out) {
-        byteBuffer.flip();
-        out.put(byteBuffer);
-        byteBuffer.clear();
+    public void writeTo(ByteBuffer out) {
+        byteBuffer.sendTo(out);
+    }
+
+    /**
+     * Writes the internal buffer to the parameter.  The internal buffer will be cleared.
+     */
+    public void writeTo(DSBinaryTransport out) {
+        byteBuffer.sendTo(out, (frame == null));
     }
 
     /**
@@ -301,19 +336,25 @@ protected void writeTo(ByteBuffer out) {
      *
      * @throws DSException if there is an IOException.
      */
-    protected void writeTo(OutputStream out) {
+    public void writeTo(OutputStream out) {
         try {
-            byteBuffer.flip();
-            //TODO - performance opt, write buffer to byte[], then byte[] to stream?
-            while (byteBuffer.hasRemaining()) {
-                out.write(byteBuffer.get());
-            }
-            byteBuffer.clear();
-        } catch (IOException x) {
+            byteBuffer.sendTo(out);
+        } catch (Exception x) {
             DSException.throwRuntime(x);
         }
     }
 
+    /**
+     * Writes the UTF8 bytes to the underlying buffer.
+     */
+    public void writeUTF8(CharSequence arg) {
+        CharBuffer chars = getCharBuffer(arg);
+        ByteBuffer strBuffer = getStringBuffer(chars.position() * (int) encoder.maxBytesPerChar());
+        encoder.encode(chars, strBuffer, false);
+        byteBuffer.put(strBuffer);
+        encoder.reset();
+    }
+
     @Override
     protected void writeValue(CharSequence arg) throws IOException {
         if (frame != null) {
@@ -347,7 +388,7 @@ boolean isMap() {
 
         void writeSize() {
             if (offset >= 0) {
-                byteBuffer.putShort(offset, (short) size);
+                byteBuffer.replaceShort(offset, (short) size, true);
             }
         }
     }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSProtocolException.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSProtocolException.java
new file mode 100644
index 00000000..afeb0632
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSProtocolException.java
@@ -0,0 +1,55 @@
+package com.acuity.iot.dsa.dslink.protocol;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * For encoding errors at the protocol level.
+ *
+ * @author Aaron Hansen
+ */
+public class DSProtocolException extends RuntimeException {
+
+    /////////////////////////////////////////////////////////////////
+    // Fields
+    /////////////////////////////////////////////////////////////////
+
+    private String detail;
+
+    /////////////////////////////////////////////////////////////////
+    // Constructors
+    /////////////////////////////////////////////////////////////////
+
+    public DSProtocolException(String msg) {
+        super(msg);
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - Public and in alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    public String getDetail() {
+        return detail;
+    }
+
+    /**
+     * Optional.
+     */
+    public DSProtocolException setDetail(String arg) {
+        detail = arg;
+        return this;
+    }
+
+    /**
+     * Optional.
+     */
+    public DSProtocolException setDetail(Throwable arg) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        arg.printStackTrace(pw);
+        pw.close();
+        detail = sw.toString();
+        return this;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSSession.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSSession.java
new file mode 100644
index 00000000..fdb56c2c
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSSession.java
@@ -0,0 +1,330 @@
+package com.acuity.iot.dsa.dslink.protocol;
+
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import org.iot.dsa.dslink.DSIRequester;
+import org.iot.dsa.dslink.DSLinkConnection;
+import org.iot.dsa.node.DSNode;
+
+/**
+ * The state of a connection to a broker as well as a protocol implementation. Not intended for link
+ * implementors.
+ *
+ * @author Aaron Hansen
+ */
+public abstract class DSSession extends DSNode {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final int MAX_MSG_ID = 2147483647;
+    private static final long MSG_TIMEOUT = 60000;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private long lastRecv;
+    private long lastSend;
+    private int nextAck = -1;
+    private int nextMessage = 1;
+    private boolean connected = false;
+    private DSLinkConnection connection;
+    private Object outgoingMutex = new Object();
+    private List<OutboundMessage> outgoingRequests = new LinkedList<OutboundMessage>();
+    private List<OutboundMessage> outgoingResponses = new LinkedList<OutboundMessage>();
+    protected boolean requesterAllowed = false;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DSSession() {
+    }
+
+    public DSSession(DSLinkConnection connection) {
+        this.connection = connection;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Can be called by the subclass to force exit the run method.
+     */
+    public void disconnect() {
+        if (!connected) {
+            return;
+        }
+        connected = false;
+        getTransport().close();
+        synchronized (outgoingMutex) {
+            notifyAll();
+        }
+        info(getPath() + " locally closed");
+    }
+
+    /**
+     * The subclass should read and process a single message.  Throw an exception to indicate
+     * an error.
+     */
+    protected abstract void doRecvMessage() throws Exception;
+
+    /**
+     * The subclass should send a single message.  Throw an exception to indicate
+     * an error.
+     */
+    protected abstract void doSendMessage() throws Exception;
+
+    /**
+     * Can return null.
+     */
+    protected OutboundMessage dequeueOutgoingResponse() {
+        synchronized (outgoingMutex) {
+            if (!outgoingResponses.isEmpty()) {
+                return outgoingResponses.remove(0);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Can return null.
+     */
+    protected OutboundMessage dequeueOutgoingRequest() {
+        synchronized (outgoingMutex) {
+            if (!outgoingRequests.isEmpty()) {
+                return outgoingRequests.remove(0);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Add a message to the outgoing request queue.
+     */
+    public void enqueueOutgoingRequest(OutboundMessage arg) {
+        if (connected) {
+            if (!requesterAllowed) {
+                throw new IllegalStateException("Requests forbidden");
+            }
+            synchronized (outgoingMutex) {
+                outgoingRequests.add(arg);
+                outgoingMutex.notify();
+            }
+        }
+    }
+
+    /**
+     * Add a message to the outgoing response queue.
+     */
+    public void enqueueOutgoingResponse(OutboundMessage arg) {
+        if (connected) {
+            synchronized (outgoingMutex) {
+                outgoingResponses.add(arg);
+                outgoingMutex.notify();
+            }
+        }
+    }
+
+    public DSLinkConnection getConnection() {
+        return connection;
+    }
+
+    @Override
+    protected String getLogName() {
+        return "Session";
+    }
+
+    /**
+     * The next ack id, or -1.
+     */
+    public synchronized int getNextAck() {
+        int ret = nextAck;
+        nextAck = -1;
+        return ret;
+    }
+
+    /**
+     * Returns the next new message id.
+     */
+    public synchronized int getNextMessageId() {
+        int ret = nextMessage;
+        if (++nextMessage > MAX_MSG_ID) {
+            nextMessage = 1;
+        }
+        return ret;
+    }
+
+    public abstract DSIRequester getRequester();
+
+    public DSTransport getTransport() {
+        return getConnection().getTransport();
+    }
+
+    protected boolean hasAckToSend() {
+        return nextAck > 0;
+    }
+
+    protected boolean hasOutgoingRequests() {
+        return !outgoingRequests.isEmpty();
+    }
+
+    protected boolean hasOutgoingResponses() {
+        return !outgoingResponses.isEmpty();
+    }
+
+    /**
+     * Override point, this returns the result of hasMessagesToSend.
+     */
+    protected boolean hasSomethingToSend() {
+        if (nextAck > 0) {
+            return true;
+        }
+        if (!outgoingResponses.isEmpty()) {
+            return true;
+        }
+        if (!outgoingRequests.isEmpty()) {
+            return true;
+        }
+        return false;
+    }
+
+    protected boolean isConnected() {
+        return connected;
+    }
+
+    /**
+     * Can be used to waking up a sleeping writer.
+     */
+    protected void notifyOutgoing() {
+        synchronized (outgoingMutex) {
+            outgoingMutex.notify();
+        }
+    }
+
+    /**
+     * Override point, called when the previous connection can be resumed. The the transport will
+     * have already been set.
+     */
+    public void onConnect() {
+        connected = true;
+    }
+
+    /**
+     * Override point, when a connection attempt failed.
+     */
+    public void onConnectFail() {
+        connected = false;
+    }
+
+    /**
+     * Override point, called after the connection is closed.
+     */
+    public void onDisconnect() {
+        synchronized (outgoingMutex) {
+            outgoingRequests.clear();
+            outgoingResponses.clear();
+        }
+    }
+
+    /**
+     * Call for each incoming message id that needs to be acked.
+     */
+    public synchronized void setNextAck(int nextAck) {
+        if (nextAck > 0) {
+            this.nextAck = nextAck;
+            notifyOutgoing();
+        }
+    }
+
+    /**
+     * Called when the broker signifies that requests are allowed.
+     */
+    public void setRequesterAllowed() {
+        requesterAllowed = true;
+    }
+
+    public abstract boolean shouldEndMessage();
+
+    /**
+     * Called by the connection, this manages the running state and calls doRun for the specific
+     * implementation.  A separate thread is spun off to manage writing.
+     */
+    public void run() {
+        lastRecv = lastSend = System.currentTimeMillis();
+        new WriteThread(getConnection().getLink().getLinkName() + " Writer").start();
+        while (connected) {
+            try {
+                verifyLastSend();
+                doRecvMessage();
+                lastRecv = System.currentTimeMillis();
+            } catch (Exception x) {
+                getTransport().close();
+                if (connected) {
+                    connected = false;
+                    error(getPath(), x);
+                }
+            }
+        }
+    }
+
+    private void verifyLastRead() throws IOException {
+        if ((System.currentTimeMillis() - lastRecv) > MSG_TIMEOUT) {
+            throw new IOException("No message received in " + MSG_TIMEOUT + "ms");
+        }
+    }
+
+    private void verifyLastSend() throws IOException {
+        if ((System.currentTimeMillis() - lastSend) > MSG_TIMEOUT) {
+            throw new IOException("No message sent in " + MSG_TIMEOUT + "ms");
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Inner Classes
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * A separate thread is used for writing to the connection.
+     */
+    private class WriteThread extends Thread {
+
+        WriteThread(String name) {
+            super(name);
+            setDaemon(true);
+        }
+
+        public void run() {
+            try {
+                while (connected) {
+                    verifyLastRead();
+                    synchronized (outgoingMutex) {
+                        if (!hasSomethingToSend()) {
+                            try {
+                                outgoingMutex.wait(5000);
+                            } catch (InterruptedException x) {
+                                warn(getPath(), x);
+                            }
+                            continue;
+                        }
+                    }
+                    doSendMessage();
+                    lastSend = System.currentTimeMillis();
+                }
+            } catch (Exception x) {
+                if (connected) {
+                    connected = false;
+                    getTransport().close();
+                    error(getPath(), x);
+                }
+            }
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1Stream.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSStream.java
similarity index 79%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1Stream.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSStream.java
index 124b8ad1..1fb48661 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1Stream.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSStream.java
@@ -1,11 +1,11 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1;
+package com.acuity.iot.dsa.dslink.protocol;
 
 /**
  * Can be closed locally and remotely.
  *
  * @author Aaron Hansen
  */
-public interface DS1Stream {
+public interface DSStream {
 
     /**
      * Use to close locally.
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/BaseMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/AbstractMessage.java
similarity index 88%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/BaseMessage.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/AbstractMessage.java
index 5e612b82..b5d4943c 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/BaseMessage.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/AbstractMessage.java
@@ -8,7 +8,7 @@
  *
  * @author Aaron Hansen
  */
-public class BaseMessage implements OutboundMessage {
+public class AbstractMessage implements OutboundMessage {
 
     /////////////////////////////////////////////////////////////////
     // Fields
@@ -23,10 +23,10 @@ public class BaseMessage implements OutboundMessage {
     // Constructors
     /////////////////////////////////////////////////////////////////
 
-    public BaseMessage() {
+    public AbstractMessage() {
     }
 
-    public BaseMessage(Integer requestId) {
+    public AbstractMessage(Integer requestId) {
         this.rid = requestId;
     }
 
@@ -39,7 +39,7 @@ public String getPath() {
     }
 
     public String getMethod() {
-        return path;
+        return method;
     }
 
     public Integer getRequestId() {
@@ -53,7 +53,7 @@ public String getStream() {
     /**
      * Looks for the path, method and request ID.
      */
-    public BaseMessage parseRequest(DSMap map) {
+    public AbstractMessage parseRequest(DSMap map) {
         setPath(map.get("path", null));
         setMethod(map.get("method", null));
         setRequestId(map.get("rid", -1));
@@ -63,7 +63,7 @@ public BaseMessage parseRequest(DSMap map) {
     /**
      * Optional, null by default.
      */
-    public BaseMessage setPath(String arg) {
+    public AbstractMessage setPath(String arg) {
         path = arg;
         return this;
     }
@@ -71,7 +71,7 @@ public BaseMessage setPath(String arg) {
     /**
      * Optional, null by default.
      */
-    public BaseMessage setMethod(String arg) {
+    public AbstractMessage setMethod(String arg) {
         method = arg;
         return this;
     }
@@ -87,7 +87,7 @@ public OutboundMessage setRequestId(Integer rid) {
     /**
      * Optional, null by default.
      */
-    public BaseMessage setStream(String arg) {
+    public AbstractMessage setStream(String arg) {
         stream = arg;
         return this;
     }
@@ -97,7 +97,8 @@ public BaseMessage setStream(String arg) {
      * write the key value pairs that have been configured on this object, but does not close the
      * response map.
      */
-    public void write(DSIWriter writer) {
+    public void write(MessageWriter out) {
+        DSIWriter writer = out.getWriter();
         writer.beginMap();
         if (rid >= 0) {
             writer.key("rid").value(rid);
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/CloseMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/CloseMessage.java
deleted file mode 100644
index 536474b4..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/CloseMessage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.message;
-
-import org.iot.dsa.io.DSIWriter;
-
-/**
- * A close request or response.
- *
- * @author Aaron Hansen
- */
-public class CloseMessage extends BaseMessage implements OutboundMessage {
-
-    /////////////////////////////////////////////////////////////////
-    // Fields
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Constructors
-    /////////////////////////////////////////////////////////////////
-
-    public CloseMessage() {
-        setMethod("close");
-        setStream("closed");
-    }
-
-    public CloseMessage(Integer rid) {
-        this();
-        setRequestId(rid);
-        setStream("closed");
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /**
-     * Calls the super implementation then writes the error object and closes the entire response
-     * object.
-     */
-    public void write(DSIWriter writer) {
-        super.write(writer);
-        writer.endMap();
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Protected and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Package and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Private and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes - in alphabetical order by class name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Facets - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/ErrorResponse.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/ErrorResponse.java
deleted file mode 100644
index adfeaa38..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/ErrorResponse.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.message;
-
-import com.acuity.iot.dsa.dslink.DSProtocolException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import org.iot.dsa.dslink.DSInvalidPathException;
-import org.iot.dsa.dslink.DSPermissionException;
-import org.iot.dsa.dslink.DSRequestException;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.util.DSException;
-
-/**
- * Encapsulates a full error response message.
- *
- * @author Aaron Hansen
- */
-public class ErrorResponse extends BaseMessage implements OutboundMessage {
-
-    /////////////////////////////////////////////////////////////////
-    // Fields
-    /////////////////////////////////////////////////////////////////
-
-    private String detail;
-    private String msg;
-    private Phase phase = Phase.REQUEST;
-    private String type;
-
-    /////////////////////////////////////////////////////////////////
-    // Constructors
-    /////////////////////////////////////////////////////////////////
-
-    public ErrorResponse() {
-        setStream("closed");
-    }
-
-    public ErrorResponse(Throwable exception) {
-        setStream("closed");
-        parse(exception);
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /**
-     * Extracts information from the exception and returns this.
-     */
-    public ErrorResponse parse(Throwable reason) {
-        if (reason instanceof DSException) {
-            Throwable tmp = reason.getCause();
-            if (tmp != null) {
-                reason = tmp;
-            }
-        }
-        if (reason instanceof DSProtocolException) {
-            DSProtocolException x = (DSProtocolException) reason;
-            detail = x.getDetail();
-            msg = x.getMessage();
-            phase = x.getPhase();
-            type = x.getType();
-        } else if (reason instanceof DSRequestException) {
-            DSRequestException x = (DSRequestException) reason;
-            setMethod(x.getMessage());
-            setDetail(x.getDetail());
-            if (reason instanceof DSInvalidPathException) {
-                setType("invalidPath");
-            } else if (reason instanceof DSPermissionException) {
-                setType("permissionDenied");
-            } else {
-                setType("invalidRequest");
-            }
-        } else {
-            setType("serverError");
-            setDetail(reason);
-            setPhase(Phase.RESPONSE);
-        }
-        return this;
-    }
-
-    /**
-     * Optional.
-     */
-    public ErrorResponse setDetail(String arg) {
-        detail = arg;
-        return this;
-    }
-
-    /**
-     * Optional.
-     */
-    public ErrorResponse setDetail(Throwable arg) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        arg.printStackTrace(pw);
-        pw.close();
-        detail = sw.toString();
-        return this;
-    }
-
-    /**
-     * Only needs to be called for responses, the default is request.
-     */
-    public ErrorResponse setPhase(Phase arg) {
-        phase = arg;
-        return this;
-    }
-
-    /**
-     * Optional.
-     */
-    public ErrorResponse setType(String arg) {
-        type = arg;
-        return this;
-    }
-
-    /**
-     * Calls the super implementation then writes the error object and closes the entire response
-     * object.
-     */
-    public void write(DSIWriter writer) {
-        super.write(writer);
-        writer.key("error").beginMap();
-        if (type != null) {
-            writer.key("type").value(type);
-        }
-        if (phase == Phase.RESPONSE) {
-            writer.key("phase").value("response");
-        }
-        if (msg != null) {
-            writer.key("msg").value(msg);
-        }
-        if (detail != null) {
-            writer.key("detail").value(detail);
-        }
-        writer.endMap().endMap();
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Protected and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Package and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Private and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes - in alphabetical order by class name.
-    /////////////////////////////////////////////////////////////////
-
-    public enum Phase {
-        REQUEST,
-        RESPONSE
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Facets - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/MessageReader.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/MessageReader.java
new file mode 100644
index 00000000..bf46cb89
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/MessageReader.java
@@ -0,0 +1,12 @@
+package com.acuity.iot.dsa.dslink.protocol.message;
+
+import org.iot.dsa.io.DSIReader;
+
+/**
+ * @author Aaron Hansen
+ */
+public interface MessageReader {
+
+    public DSIReader getReader();
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/MessageWriter.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/MessageWriter.java
new file mode 100644
index 00000000..e86ea71f
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/MessageWriter.java
@@ -0,0 +1,12 @@
+package com.acuity.iot.dsa.dslink.protocol.message;
+
+import org.iot.dsa.io.DSIWriter;
+
+/**
+ * @author Aaron Hansen
+ */
+public interface MessageWriter {
+
+    public DSIWriter getWriter();
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/OutboundMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/OutboundMessage.java
index 42f1802b..4b59fbcc 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/OutboundMessage.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/OutboundMessage.java
@@ -1,7 +1,5 @@
 package com.acuity.iot.dsa.dslink.protocol.message;
 
-import org.iot.dsa.io.DSIWriter;
-
 /**
  * @author Aaron Hansen
  */
@@ -10,6 +8,6 @@ public interface OutboundMessage {
     /**
      * Write the full request or response message object.
      */
-    public void write(DSIWriter writer);
+    public void write(MessageWriter writer);
 
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/RequestPath.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/RequestPath.java
similarity index 79%
rename from dslink-core/src/main/java/org/iot/dsa/dslink/RequestPath.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/RequestPath.java
index 2785162d..9bf638cd 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/RequestPath.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/message/RequestPath.java
@@ -1,5 +1,7 @@
-package org.iot.dsa.dslink;
+package com.acuity.iot.dsa.dslink.protocol.message;
 
+import org.iot.dsa.dslink.DSIResponder;
+import org.iot.dsa.dslink.DSInvalidPathException;
 import org.iot.dsa.node.DSIObject;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
@@ -10,11 +12,7 @@
  *
  * @author Aaron Hansen
  */
-class RequestPath {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
+public class RequestPath {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -31,7 +29,13 @@ class RequestPath {
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    RequestPath(String path, DSNode root) {
+    public RequestPath(String path, DSNode root) {
+        if (root == null) {
+            throw new NullPointerException("Null root");
+        }
+        if (path == null) {
+            path = "";
+        }
         this.path = path;
         this.root = root;
         names = DSPath.decodePath(path);
@@ -42,9 +46,9 @@ class RequestPath {
     ///////////////////////////////////////////////////////////////////////////
 
     /**
-     * The info of the target in the parent.
+     * The info of the target in it's parent.
      */
-    DSInfo getInfo() {
+    public DSInfo getInfo() {
         if (target == null) {
             getTarget();
         }
@@ -54,7 +58,7 @@ DSInfo getInfo() {
     /**
      * The parent of the target unless the request was for /
      */
-    DSNode getParent() {
+    public DSNode getParent() {
         if (parent == null) {
             getTarget();
         }
@@ -62,13 +66,14 @@ DSNode getParent() {
     }
 
     /**
-     * If the target is a responder, this is path to send to it.
+     * If the target is a responder, this is path it should use, not the original path of the
+     * request.
      */
-    String getPath() {
+    public String getPath() {
         return path;
     }
 
-    DSIObject getTarget() {
+    public DSIObject getTarget() {
         if (parent == null) {
             parent = root.getParent();
             target = root;
@@ -107,12 +112,8 @@ DSIObject getTarget() {
         return target;
     }
 
-    boolean isResponder() {
+    public boolean isResponder() {
         return target instanceof DSIResponder;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1LinkConnection.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1LinkConnection.java
deleted file mode 100644
index 958f2fc8..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1LinkConnection.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1;
-
-import com.acuity.iot.dsa.dslink.DSTransport;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-import org.iot.dsa.dslink.DSIRequester;
-import org.iot.dsa.dslink.DSLink;
-import org.iot.dsa.dslink.DSLinkConfig;
-import org.iot.dsa.dslink.DSLinkConnection;
-import org.iot.dsa.time.DSTime;
-import org.iot.dsa.util.DSException;
-
-/**
- * The default connection implementation. Performs connection initialization with the broker, then
- * creates a transport and a protocol based on the broker response.
- *
- * @author Aaron Hansen
- */
-public class DS1LinkConnection extends DSLinkConnection {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    static final String CONNECTION_INIT = "Initialization";
-    static final String SESSION = "Session";
-    static final String TRANSPORT = "Transport";
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private String connectionId;
-    private DS1ConnectionInit connectionInit;
-    private DSLink link;
-    private ConcurrentHashMap<Listener, Listener> listeners;
-    private Logger logger;
-    private Object mutex = new Object();
-    private DS1Session session;
-    private long reconnectRate = 1000;
-    private DSTransport transport;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void addListener(Listener listener) {
-        synchronized (this) {
-            if (listeners == null) {
-                listeners = new ConcurrentHashMap<Listener, Listener>();
-            }
-        }
-        listeners.put(listener, listener);
-    }
-
-    @Override
-    public String getConnectionId() {
-        if (connectionId == null) {
-            StringBuilder builder = new StringBuilder();
-            builder.append(link.getLinkName()).append("-");
-            String uri = link.getConfig().getBrokerUri();
-            if ((uri != null) && !uri.isEmpty()) {
-                int idx = uri.indexOf("://") + 3;
-                if ((idx > 0) && (uri.length() > idx)) {
-                    int end = uri.indexOf("/", idx);
-                    if (end > idx) {
-                        builder.append(uri.substring(idx, end));
-                    } else {
-                        builder.append(uri.substring(idx));
-                    }
-                }
-            } else {
-                builder.append(Integer.toHexString(hashCode()));
-            }
-            connectionId = builder.toString();
-            info(info() ? "Connection ID: " + connectionId : null);
-        }
-        return connectionId;
-    }
-
-    @Override
-    public DSLink getLink() {
-        return link;
-    }
-
-    /**
-     * The default logger for this connection, the logging name will be the connection ID.
-     */
-    @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(getLink().getLinkName() + ".connection");
-        }
-        return logger;
-    }
-
-    @Override
-    public DSIRequester getRequester() {
-        return session.getRequester();
-    }
-
-    protected DS1ConnectionInit initializeConnection() throws Exception {
-        DS1ConnectionInit init = new DS1ConnectionInit();
-        put(CONNECTION_INIT, init).setTransient(true);
-        init.initializeConnection();
-        return init;
-    }
-
-    @Override
-    public boolean isOpen() {
-        DSTransport tpt = transport;
-        if (tpt == null) {
-            return false;
-        }
-        return tpt.isOpen();
-    }
-
-    /**
-     * Looks at the connection initialization response to determine the protocol implementation.
-     */
-    protected DS1Session makeSession(DS1ConnectionInit init) {
-        String version = init.getResponse().get("version", "");
-        if (!version.startsWith("1.1.2")) {
-            throw new IllegalStateException("Unsupported version: " + version);
-        }
-        return new DS1Session();
-    }
-
-    /**
-     * Looks at the connection initialization response to determine the type of transport then
-     * instantiates the correct type fom the config.
-     */
-    protected DSTransport makeTransport(DS1ConnectionInit init) {
-        DSTransport.Factory factory = null;
-        DSTransport transport = null;
-        try {
-            String type = link.getConfig().getConfig(
-                    DSLinkConfig.CFG_TRANSPORT_FACTORY,
-                    "org.iot.dsa.dslink.websocket.StandaloneTransportFactory");
-            factory = (DSTransport.Factory) Class.forName(type).newInstance();
-            transport = factory.makeTransport(init.getResponse());
-        } catch (Exception x) {
-            DSException.throwRuntime(x);
-        }
-        String wsUri = init.getResponse().get("wsUri", null);
-        if (wsUri == null) {
-            throw new IllegalStateException("Only websocket transports are supported.");
-        }
-        String uri = init.makeWsUrl(wsUri);
-        config(config() ? "Connection URL = " + uri : null);
-        transport.setConnectionUrl(uri);
-        transport.setConnection(this);
-        transport.setReadTimeout(getLink().getConfig().getConfig(
-                DSLinkConfig.CFG_READ_TIMEOUT, 60000));
-        return transport;
-    }
-
-    /**
-     * Called by the transport when the network connection is closed.
-     */
-    public void onClose() {
-        if (session != null) {
-            session.close();
-        }
-    }
-
-    /**
-     * Spawns a thread to manage opening the connection and subsequent reconnections.
-     */
-    @Override
-    public void onStable() {
-        if (isOpen()) {
-            throw new IllegalStateException("Connection already open");
-        }
-        this.link = (DSLink) getParent();
-        new ConnectionRunThread(new ConnectionRunner()).start();
-    }
-
-    @Override
-    public void removeListener(Listener listener) {
-        if (listeners != null) {
-            listeners.remove(listener);
-        }
-    }
-
-    public void setRequesterAllowed() {
-        session.setRequesterAllowed();
-    }
-
-    public void updateSalt(String salt) {
-        connectionInit.updateSalt(salt);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Daemon thread that manages connection and reconnection.
-     */
-    private class ConnectionRunner implements Runnable {
-
-        /**
-         * Runs until stop is called.
-         */
-        public void run() {
-            while (isRunning()) {
-                try {
-                    synchronized (mutex) {
-                        try {
-                            mutex.wait(reconnectRate);
-                        } catch (Exception x) {
-                            warn(warn() ? getConnectionId() : null, x);
-                        }
-                    }
-                    //We need to reinitialize if there are any connection failures, so
-                    //only hold the init reference after successfully connected.
-                    DS1ConnectionInit init = connectionInit;
-                    connectionInit = null;
-                    if (init == null) {
-                        init = initializeConnection();
-                    }
-                    transport = makeTransport(init);
-                    put(TRANSPORT, transport).setTransient(true);
-                    config(config() ? "Transport type: " + transport.getClass().getName() : null);
-                    if (session == null) {
-                        session = makeSession(init);
-                        config(config() ? "Session type: " + session.getClass().getName() : null);
-                        put(SESSION, session).setTransient(true);
-                        session.setConnection(DS1LinkConnection.this);
-                    }
-                    try {
-                        transport.open();
-                        session.setTransport(transport);
-                        connectionInit = init;
-                        session.onConnect();
-                    } catch (Exception x) {
-                        session.onConnectFail();
-                        throw x;
-                    }
-                    if (listeners != null) {
-                        for (Listener listener : listeners.keySet()) {
-                            try {
-                                listener.onConnect(DS1LinkConnection.this);
-                            } catch (Exception x) {
-                                severe(listener.toString(), x);
-                            }
-                        }
-                    }
-                    session.run();
-                    reconnectRate = 1000;
-                } catch (Throwable x) {
-                    reconnectRate = Math.min(reconnectRate * 2, DSTime.MILLIS_MINUTE);
-                    severe(getConnectionId(), x);
-                }
-                for (Listener listener : listeners.keySet()) {
-                    try {
-                        listener.onDisconnect(DS1LinkConnection.this);
-                    } catch (Exception x) {
-                        severe(listener.toString(), x);
-                    }
-                }
-                if (session != null) {
-                    session.onDisconnect();
-                }
-                if (transport != null) {
-                    remove(TRANSPORT);
-                    transport = null;
-                }
-            }
-        }
-    }
-
-    /**
-     * Daemon thread that manages connection and reconnection.
-     */
-    private class ConnectionRunThread extends Thread {
-
-        public ConnectionRunThread(ConnectionRunner runner) {
-            super(runner);
-            setName(getConnectionId() + " Runner");
-            setDaemon(true);
-        }
-    }
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1Session.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1Session.java
deleted file mode 100644
index 9a4de032..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1Session.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1;
-
-import static org.iot.dsa.io.DSIReader.Token.BEGIN_LIST;
-import static org.iot.dsa.io.DSIReader.Token.BEGIN_MAP;
-import static org.iot.dsa.io.DSIReader.Token.END_LIST;
-import static org.iot.dsa.io.DSIReader.Token.END_MAP;
-import static org.iot.dsa.io.DSIReader.Token.NULL;
-
-import com.acuity.iot.dsa.dslink.DSProtocolException;
-import com.acuity.iot.dsa.dslink.DSSession;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester.DS1Requester;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder.DS1Responder;
-import java.io.IOException;
-import org.iot.dsa.dslink.DSIRequester;
-import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIReader.Token;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSInt;
-import org.iot.dsa.node.DSMap;
-
-/**
- * Implements DSA 1.1.2
- *
- * @author Aaron Hansen
- */
-public class DS1Session extends DSSession {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    static final String LAST_ACK_RECV = "Last Ack Recv";
-    static final String LAST_ACK_SENT = "Last Ack Sent";
-
-    static final int MAX_MSG_ID = 2147483647;
-    static final int MAX_MSG_IVL = 45000;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSInfo lastAckRecv = getInfo(LAST_ACK_RECV);
-    private DSInfo lastAckSent = getInfo(LAST_ACK_SENT);
-    private int nextAck = -1;
-    private int nextMsg = 1;
-    private DS1Requester requester = new DS1Requester(this);
-    private DS1Responder responder = new DS1Responder(this);
-
-    /////////////////////////////////////////////////////////////////
-    // Constructors
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods
-    /////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void beginMessage() {
-        DSIWriter out = getWriter();
-        out.beginMap();
-        if (++nextMsg > MAX_MSG_ID) {
-            nextMsg = 1;
-        }
-        out.key("msg").value(nextMsg);
-        synchronized (this) {
-            if (nextAck > 0) {
-                out.key("ack").value(nextAck);
-                put(lastAckSent, DSInt.valueOf(nextAck));
-                nextAck = -1;
-            }
-        }
-    }
-
-    @Override
-    protected void beginResponses() {
-        getWriter().key("responses").beginList();
-    }
-
-    @Override
-    protected void beginRequests() {
-        getWriter().key("requests").beginList();
-    }
-
-    @Override
-    protected void declareDefaults() {
-        declareDefault(LAST_ACK_RECV, DSInt.NULL).setReadOnly(true);
-        declareDefault(LAST_ACK_SENT, DSInt.NULL).setReadOnly(true);
-    }
-
-    @Override
-    protected void doRead() throws IOException {
-        DSIReader reader = getReader();
-        while (isOpen()) {
-            switch (reader.next()) {
-                case BEGIN_MAP:
-                    processEnvelope(reader);
-                    break;
-                case END_MAP:
-                case END_LIST:
-                case ROOT:
-                    break;
-                case END_INPUT:
-                    return;
-                default:
-                    throw new IllegalStateException("Unexpected input: " + reader.last());
-            }
-        }
-    }
-
-    @Override
-    protected void endMessage() {
-        getWriter().endMap().flush();
-    }
-
-    @Override
-    protected void endResponses() {
-        getWriter().endList();
-    }
-
-    @Override
-    protected void endRequests() {
-        getWriter().endList();
-    }
-
-    @Override
-    public DSIRequester getRequester() {
-        return requester;
-    }
-
-    private boolean hasPingToSend() {
-        return (System.currentTimeMillis() - getLastMessageSent()) > MAX_MSG_IVL;
-    }
-
-    /**
-     * Override point, returns true if there are any pending acks or outbound messages queued up.
-     */
-    protected boolean hasSomethingToSend() {
-        if (nextAck > 0) {
-            return true;
-        }
-        if (hasPingToSend()) {
-            return true;
-        }
-        return super.hasSomethingToSend();
-    }
-
-    /*
-    @Override
-    protected void onStable() {
-        put("Requester Session", requesterSession);
-        put("Responder Session", responderSession);
-    }
-    */
-
-    @Override
-    public void onConnect() {
-        super.onConnect();
-        requester.onConnect();
-        responder.onConnect();
-    }
-
-    @Override
-    public void onConnectFail() {
-        requester.onConnectFail();
-        responder.onConnectFail();
-    }
-
-    @Override
-    public void onDisconnect() {
-        super.onDisconnect();
-        requester.onDisconnect();
-        responder.onDisconnect();
-    }
-
-    /**
-     * Decomposes and processes a complete envelope which can contain multiple requests and
-     * responses.
-     *
-     * @param reader lastRun() will return BEGIN_MAP
-     */
-    protected void processEnvelope(DSIReader reader) {
-        if (!requesterAllowed) {
-            getConnection().setRequesterAllowed();
-        }
-        int msg = -1;
-        Token next;
-        switch (reader.next()) {
-            case END_MAP:
-                return;
-            case STRING:
-                break;
-            default:
-                throw new IllegalStateException("Poorly formatted request");
-        }
-        boolean sendAck = false;
-        do {
-            String key = reader.getString();
-            if (key.equals("requests")) {
-                sendAck = true;
-                processMessages(reader, true);
-            } else if (key.equals("responses")) {
-                sendAck = true;
-                processMessages(reader, false);
-            } else if (key.equals("msg")) {
-                reader.next();
-                msg = (int) reader.getLong();
-            } else if (key.equals("ack")) {
-                reader.next();
-                put(lastAckRecv, DSInt.valueOf((int) reader.getLong()));
-            } else if (key.equals("allowed")) {
-                if (reader.next() != Token.BOOLEAN) {
-                    throw new IllegalStateException("Allowed not a boolean");
-                }
-                if (reader.getBoolean()) {
-                    config(config() ? "Requester allowed" : null);
-                    getConnection().setRequesterAllowed();
-                }
-            } else if (key.equals("salt")) {
-                if (reader.next() != Token.STRING) {
-                    throw new IllegalStateException("Salt not a string");
-                }
-                config(config() ? "Next salt: " + reader.getString() : null);
-                getConnection().updateSalt(reader.getString());
-            }
-            next = reader.next();
-        } while (next != END_MAP);
-        if (sendAck && (msg >= 0)) {
-            sendAck(msg);
-        }
-    }
-
-    /**
-     * Processes a list of requests or responses.
-     *
-     * @param areRequests True for requests, false for responses.
-     */
-    protected void processMessages(DSIReader reader, boolean areRequests) {
-        Token next = reader.next();
-        if (next == NULL) {
-            return;
-        }
-        if (next != BEGIN_LIST) {
-            throw new IllegalStateException("Requests should be a list");
-        }
-        DSMap req;
-        int rid;
-        while (reader.next() == BEGIN_MAP) {
-            req = reader.getMap();
-            rid = req.get("rid", -1);
-            if (rid < 0) {
-                finest(finest() ? "No request ID: " + req.toString() : null);
-                throw new DSProtocolException("Response missing rid");
-            }
-            if (areRequests) {
-                responder.processRequest(rid, req);
-            } else {
-                requester.processResponse(rid, req);
-            }
-
-        }
-        if (reader.last() != END_LIST) {
-            throw new IllegalStateException("Unexpected input: " + reader.last());
-        }
-    }
-
-    /**
-     * We need to send an ack to the broker.
-     */
-    private synchronized void sendAck(int msg) {
-        nextAck = msg;
-        notifyOutgoing();
-    }
-
-    public boolean shouldEndMessage() {
-        return getTransport().shouldEndMessage();
-    }
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscriptions.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscriptions.java
deleted file mode 100644
index 7a9aa3a6..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscriptions.java
+++ /dev/null
@@ -1,272 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
-
-import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Session;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester.DS1OutboundSubscribeStubs.State;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.logging.Logger;
-import org.iot.dsa.dslink.requester.OutboundSubscribeHandler;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.logging.DSLogger;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSMap;
-import org.iot.dsa.node.DSNull;
-import org.iot.dsa.node.DSStatus;
-import org.iot.dsa.time.DSDateTime;
-
-/**
- * Manages all subscriptions for a requester.
- *
- * @author Aaron Hansen
- */
-class DS1OutboundSubscriptions extends DSLogger implements OutboundMessage {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static final Integer ZERO = Integer.valueOf(0);
-    static final int MAX_SID = 2147483647;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private boolean enqueued = false;
-    private Logger logger;
-    private int nextSid = 1;
-    private final ConcurrentLinkedQueue<DS1OutboundSubscribeStubs> pendingSubscribe =
-            new ConcurrentLinkedQueue<DS1OutboundSubscribeStubs>();
-    private final ConcurrentLinkedQueue<DS1OutboundSubscribeStubs> pendingUnsubscribe =
-            new ConcurrentLinkedQueue<DS1OutboundSubscribeStubs>();
-    private final Map<String, DS1OutboundSubscribeStubs> pathMap =
-            new ConcurrentHashMap<String, DS1OutboundSubscribeStubs>();
-    private DS1Requester requester;
-    private final Map<Integer, DS1OutboundSubscribeStubs> sidMap =
-            new ConcurrentHashMap<Integer, DS1OutboundSubscribeStubs>();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    DS1OutboundSubscriptions(DS1Requester requester) {
-        this.requester = requester;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods in alphabetical order
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = requester.getLogger();
-        }
-        return logger;
-    }
-
-    /**
-     * This is already synchronized by the subscribe method.
-     */
-    private int getNextSid() {
-        int ret = nextSid;
-        if (++nextSid > MAX_SID) {
-            nextSid = 1;
-        }
-        return ret;
-    }
-
-    DS1Requester getRequester() {
-        return requester;
-    }
-
-    public void onConnect() {
-    }
-
-    public void onConnectFail() {
-    }
-
-    public void onDisconnect() {
-    }
-
-    void processUpdate(DSElement updateElement) {
-        int sid = -1;
-        DSElement value;
-        String ts, sts = null;
-        if (updateElement instanceof DSList) {
-            DSList updateList = (DSList) updateElement;
-            int cols = updateList.size();
-            if (cols < 3) {
-                finest(finest() ? "Update incomplete: " + updateList.toString() : null);
-                return;
-            }
-            sid = updateList.get(0, -1);
-            value = updateList.get(1);
-            ts = updateList.getString(2);
-            sts = updateList.get(3, (String) null);
-        } else if (updateElement instanceof DSMap) {
-            DSMap updateMap = (DSMap) updateElement;
-            sid = updateMap.get("sid", -1);
-            value = updateMap.get("value");
-            ts = updateMap.getString("ts");
-            sts = updateMap.get("status", (String) null);
-        } else {
-            return;
-        }
-        if (sid < 0) {
-            finer(finer() ? "Update missing sid: " + updateElement.toString() : null);
-            return;
-        }
-        DS1OutboundSubscribeStubs stub = sidMap.get(sid);
-        if (stub == null) {
-            finer(finer() ? ("Unexpected subscription update " + sidMap.toString()) : null);
-            return;
-        }
-        DSDateTime timestamp = null;
-        if (ts == null) {
-            timestamp = DSDateTime.currentTime();
-        } else {
-            timestamp = DSDateTime.valueOf(ts);
-        }
-        DSStatus status = DSStatus.ok;
-        if (sts != null) {
-            status = DSStatus.valueOf(sts);
-        }
-        if (value == null) {
-            value = DSNull.NULL;
-        }
-        stub.process(timestamp, value, status);
-    }
-
-    void processUpdates(DSMap map) {
-        DSList updates = map.getList("updates");
-        for (int i = 0; i < updates.size(); i++) {
-            DSElement update = updates.get(i);
-            processUpdate(update);
-        }
-    }
-
-    private void sendMessage() {
-        synchronized (this) {
-            if (enqueued) {
-                return;
-            }
-            enqueued = true;
-        }
-        requester.sendRequest(this);
-    }
-
-    /**
-     * Create or update a subscription.
-     */
-    OutboundSubscribeHandler subscribe(String path, int qos, OutboundSubscribeHandler req) {
-        DS1OutboundSubscribeStub stub = new DS1OutboundSubscribeStub(path, qos, req);
-        boolean send = true;
-        synchronized (pathMap) {
-            DS1OutboundSubscribeStubs stubs = pathMap.get(path);
-            if (stubs == null) {
-                stubs = new DS1OutboundSubscribeStubs(path, getNextSid(), this);
-                stubs.add(stub);
-                pendingSubscribe.add(stubs);
-                pathMap.put(path, stubs);
-                sidMap.put(stubs.getSid(), stubs);
-            } else {
-                send = qos > stubs.getQos();
-                stubs.add(stub);
-                if (send) {
-                    stubs.setState(State.PENDING_SUBSCRIBE);
-                    pendingSubscribe.add(stubs);
-                }
-            }
-        }
-        if (send) {
-            sendMessage();
-        }
-        try {
-            req.onInit(path, qos, stub);
-        } catch (Exception x) {
-            severe(path, x);
-        }
-        return req;
-    }
-
-    /**
-     * Remove the subscription and call onClose.
-     */
-    void unsubscribe(DS1OutboundSubscribeStubs stubs) {
-        synchronized (pathMap) {
-            if (stubs.size() == 0) {
-                stubs.setState(State.PENDING_UNSUBSCRIBE);
-                pendingUnsubscribe.add(stubs);
-                sendMessage();
-            }
-        }
-    }
-
-    @Override
-    public void write(DSIWriter out) {
-        DS1Session session = requester.getSession();
-        if (!pendingSubscribe.isEmpty()) {
-            out.beginMap();
-            out.key("rid").value(requester.getNextRid());
-            out.key("method").value("subscribe");
-            Iterator<DS1OutboundSubscribeStubs> it = pendingSubscribe.iterator();
-            out.key("paths").beginList();
-            while (it.hasNext() && !session.shouldEndMessage()) {
-                DS1OutboundSubscribeStubs stubs = it.next();
-                if (stubs.getState() == State.PENDING_SUBSCRIBE) {
-                    out.beginMap();
-                    out.key("path").value(stubs.getPath());
-                    out.key("sid").value(stubs.getSid());
-                    if (stubs.getQos() > 0) {
-                        out.key("qos").value(stubs.getQos());
-                    }
-                    stubs.setState(State.SUBSCRIBED);
-                    out.endMap();
-                }
-                it.remove();
-            }
-            out.endList();
-            out.endMap();
-        }
-        if (!pendingUnsubscribe.isEmpty() && !session.shouldEndMessage()) {
-            out.beginMap();
-            out.key("rid").value(requester.getNextRid());
-            out.key("method").value("unsubscribe");
-            out.key("sids").beginList();
-            Iterator<DS1OutboundSubscribeStubs> it = pendingUnsubscribe.iterator();
-            while (it.hasNext() && !session.shouldEndMessage()) {
-                DS1OutboundSubscribeStubs stubs = it.next();
-                synchronized (pathMap) {
-                    if (stubs.size() == 0) {
-                        pathMap.remove(stubs.getPath());
-                        sidMap.remove(stubs.getSid());
-                        out.value(stubs.getSid());
-                    }
-                }
-                it.remove();
-            }
-            out.endList();
-            out.endMap();
-        }
-        synchronized (this) {
-            enqueued = false;
-        }
-        if (!pendingSubscribe.isEmpty() || !pendingUnsubscribe.isEmpty()) {
-            sendMessage();
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundList.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundList.java
deleted file mode 100644
index fd21bc9d..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundList.java
+++ /dev/null
@@ -1,536 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
-
-import com.acuity.iot.dsa.dslink.protocol.message.ErrorResponse;
-import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Stream;
-import java.util.Iterator;
-import org.iot.dsa.DSRuntime;
-import org.iot.dsa.dslink.responder.ApiObject;
-import org.iot.dsa.dslink.responder.InboundListRequest;
-import org.iot.dsa.dslink.responder.OutboundListResponse;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSMap;
-import org.iot.dsa.node.DSMap.Entry;
-import org.iot.dsa.node.DSMetadata;
-import org.iot.dsa.node.DSPath;
-import org.iot.dsa.node.action.ActionSpec;
-
-/**
- * List implementation for a responder.
- *
- * @author Aaron Hansen
- */
-class DS1InboundList extends DS1InboundRequest
-        implements DS1Stream, InboundListRequest, OutboundMessage, Runnable {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static final int STATE_INIT = 0;
-    private static final int STATE_CHILDREN = 1;
-    private static final int STATE_UPDATES = 2;
-    private static final int STATE_CLOSE_PENDING = 3;
-    private static final int STATE_CLOSED = 4;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private StringBuilder cacheBuf = new StringBuilder();
-    private DSList cacheList = new DSList();
-    private DSMap cacheMap = new DSMap();
-    private DSMetadata cacheMeta = new DSMetadata(cacheMap);
-    private Iterator<ApiObject> children;
-    private Exception closeReason;
-    private OutboundListResponse response;
-    private boolean enqueued = false;
-    private int state = STATE_INIT;
-    private Update updateHead;
-    private Update updateTail;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    DS1InboundList() {
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods in alphabetical order
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void childAdded(ApiObject child) {
-        if (!isClosed()) {
-            enqueue(new Update(child, true));
-        }
-    }
-
-    @Override
-    public void childRemoved(ApiObject child) {
-        if (!isClosed()) {
-            enqueue(new Update(child, false));
-        }
-    }
-
-    @Override
-    public void close() {
-        if (!isOpen()) {
-            return;
-        }
-        state = STATE_CLOSE_PENDING;
-        enqueueResponse();
-        fine(fine() ? getPath() + " list closed locally" : null);
-    }
-
-    @Override
-    public void close(Exception reason) {
-        if (!isOpen()) {
-            return;
-        }
-        state = STATE_CLOSE_PENDING;
-        closeReason = reason;
-        enqueueResponse();
-        fine(fine() ? getPath() + " list closed locally" : null);
-    }
-
-    /**
-     * Remove an update from the queue.
-     */
-    private synchronized Update dequeue() {
-        if (updateHead == null) {
-            return null;
-        }
-        Update ret = null;
-        ret = updateHead;
-        if (updateHead == updateTail) {
-            updateHead = null;
-            updateTail = null;
-        } else {
-            updateHead = updateHead.next;
-        }
-        ret.next = null;
-        return ret;
-    }
-
-    private void doClose() {
-        state = STATE_CLOSED;
-        getResponder().removeInboundRequest(getRequestId());
-        if (response == null) {
-            return;
-        }
-        DSRuntime.run(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    response.onClose();
-                } catch (Exception x) {
-                    severe(getPath(), x);
-                }
-            }
-        });
-    }
-
-    private void encodeChild(ApiObject child, DSIWriter out) {
-        out.beginList();
-        String name = child.getName();
-        String displayName = null;
-        if (DSPath.encodeName(name, cacheBuf)) {
-            displayName = name;
-            out.value(cacheBuf.toString());
-        } else {
-            out.value(name);
-        }
-        cacheBuf.setLength(0);
-        out.beginMap();
-        if (displayName != null) {
-            out.key("$name").value(displayName);
-        }
-        child.getMetadata(cacheMap.clear());
-        if (cacheMap.contains("is")) {
-            out.key("$is").value(cacheMap.getString("is"));
-        } else {
-            out.key("$is").value("node");
-        }
-        if (child.isAction()) {
-            ActionSpec action = child.getAction();
-            if (cacheMap.contains("invokable")) {
-                out.key("$invokable").value(cacheMap.get("invokable"));
-            } else {
-                out.key("$invokable").value(action.getPermission().toString());
-            }
-        } else if (child.isValue()) {
-            out.key("$type");
-            encodeType(child.getValue(), cacheMeta, out);
-            if (!child.isReadOnly()) {
-                out.key("$writable").value(child.isConfig() ? "config" : "write");
-            }
-        } else if (child.isConfig()) {
-            out.key("$permission").value("config");
-        }
-        out.endMap().endList();
-        cacheMap.clear();
-    }
-
-    /**
-     * Encode all the meta data about the root target of a list request.
-     */
-    private void encodeTarget(ApiObject object, DSIWriter out) {
-        object.getMetadata(cacheMap.clear());
-        if (cacheMap.contains("is")) {
-            out.beginList().value("$is").value(cacheMap.getString("is")).endList();
-            cacheMap.remove("is");
-        } else {
-            out.beginList().value("$is").value("node").endList();
-        }
-        String safeName = object.getName();
-        if (DSPath.encodeName(safeName, cacheBuf)) {
-            safeName = cacheBuf.toString();
-        }
-        cacheBuf.setLength(0);
-        out.beginList().value("$name").value(safeName).endList();
-        if (object.isAction()) {
-            encodeTargetAction(object.getAction(), out);
-        } else if (object.isValue()) {
-            encodeTargetValue(object, out);
-        } else if (object.isConfig()) {
-            out.beginList().value("$permission").value("config").endList();
-        }
-        encodeTargetMetadata(cacheMap, out);
-        cacheMap.clear();
-    }
-
-    /**
-     * Called by encodeTarget for actions.
-     */
-    private void encodeTargetAction(ActionSpec action, DSIWriter out) {
-        if (!cacheMap.contains("invokable")) {
-            out.beginList()
-               .value("$invokable")
-               .value(action.getPermission().toString())
-               .endList();
-        }
-        if (!cacheMap.contains("params")) {
-            out.beginList().value("$params").beginList();
-            Iterator<DSMap> params = action.getParameters();
-            if (params != null) {
-                while (params.hasNext()) {
-                    out.value(fixType(params.next()));
-                }
-            }
-            out.endList().endList();
-        }
-        if (action.getResultType().isValues()) {
-            if (!cacheMap.contains("columns")) {
-                out.beginList().value("$columns").beginList();
-                Iterator<DSMap> it = action.getValueResults();
-                if (it != null) {
-                    while (it.hasNext()) {
-                        out.value(fixType(it.next()));
-                    }
-                }
-                out.endList().endList();
-            }
-        }
-        if (!cacheMap.contains("result")) {
-            if (!action.getResultType().isVoid()) {
-                out.beginList()
-                   .value("$result")
-                   .value(action.getResultType().toString())
-                   .endList();
-            }
-        }
-    }
-
-    /**
-     * Called by encodeTarget, encodes meta-data as configs.
-     */
-    private void encodeTargetMetadata(DSMap metadata, DSIWriter out) {
-        if (cacheMap.isEmpty()) {
-            return;
-        }
-        Entry entry;
-        for (int i = 0, len = cacheMap.size(); i < len; i++) {
-            entry = cacheMap.getEntry(i);
-            out.beginList();
-            cacheBuf.append("$");
-            DSPath.encodeName(entry.getKey(), cacheBuf);
-            out.value(cacheBuf.toString());
-            cacheBuf.setLength(0);
-            out.value(entry.getValue());
-            out.endList();
-        }
-    }
-
-    /**
-     * Called by encodeTarget for values.
-     */
-    private void encodeTargetValue(ApiObject object, DSIWriter out) {
-        DSIValue value = object.getValue();
-        if (!cacheMap.contains("type")) {
-            out.beginList();
-            out.value("$type");
-            encodeType(object.getValue(), cacheMeta, out);
-            out.endList();
-        }
-        if (!cacheMap.contains("writable")) {
-            if (!object.isReadOnly()) {
-                out.beginList()
-                   .value("$writable")
-                   .value(object.isConfig() ? "config" : "write")
-                   .endList();
-            }
-        }
-    }
-
-    private void encodeType(DSIValue value, DSMetadata meta, DSIWriter out) {
-        String type = meta.getType();
-        if ((type == null) && (value != null)) {
-            meta.setType(value);
-        }
-        fixType(cacheMap);
-        out.value(cacheMap.remove(DSMetadata.TYPE));
-    }
-
-    private void encodeUpdate(Update update, DSIWriter out) {
-        if (!isOpen()) {
-            return;
-        }
-        if (update.added) {
-            encodeChild(update.child, out);
-        } else {
-            out.beginMap();
-            out.key("name").value(DSPath.encodeName(update.child.getName()));
-            out.key("change").value("remove");
-            out.endMap();
-        }
-    }
-
-    private void enqueue(Update update) {
-        if (!isOpen()) {
-            return;
-        }
-        synchronized (this) {
-            if (updateHead == null) {
-                updateHead = update;
-                updateTail = update;
-            } else {
-                updateTail.next = update;
-                updateTail = update;
-            }
-            if (enqueued) {
-                return;
-            }
-        }
-        getResponder().sendResponse(this);
-    }
-
-    /**
-     * Enqueues in the session.
-     */
-    private void enqueueResponse() {
-        synchronized (this) {
-            if (enqueued) {
-                return;
-            }
-            enqueued = true;
-        }
-        getResponder().sendResponse(this);
-    }
-
-    /**
-     * Combines boolean and enum ranges into the type name.
-     */
-    private DSMap fixType(DSMap arg) {
-        String type = arg.getString(DSMetadata.TYPE);
-        if ("bool".equals(type)) {
-            DSList range = (DSList) arg.remove(DSMetadata.BOOLEAN_RANGE);
-            if ((range == null) || (range.size() != 2)) {
-                return arg;
-            } else {
-                cacheBuf.setLength(0);
-                cacheBuf.append(type);
-                cacheBuf.append('[');
-                cacheBuf.append(range.get(0).toString());
-                cacheBuf.append(',');
-                cacheBuf.append(range.get(1).toString());
-                cacheBuf.append(']');
-                arg.put(DSMetadata.TYPE, cacheBuf.toString());
-            }
-        } else if ("enum".equals(type)) {
-            DSList range = (DSList) arg.remove(DSMetadata.ENUM_RANGE);
-            if (range == null) {
-                return arg;
-            }
-            cacheBuf.setLength(0);
-            cacheBuf.append(type);
-            cacheBuf.append('[');
-            for (int i = 0, len = range.size(); i < len; i++) {
-                if (i > 0) {
-                    cacheBuf.append(',');
-                }
-                cacheBuf.append(range.get(i).toString());
-            }
-            cacheBuf.append(']');
-            arg.put(DSMetadata.TYPE, cacheBuf.toString());
-        }
-        return arg;
-    }
-
-    private boolean isClosed() {
-        return state == STATE_CLOSED;
-    }
-
-    private boolean isClosePending() {
-        return state == STATE_CLOSE_PENDING;
-    }
-
-    /**
-     * Not closed or closed pending.
-     */
-    @Override
-    public boolean isOpen() {
-        return (state != STATE_CLOSE_PENDING) && (state != STATE_CLOSED);
-    }
-
-    @Override
-    public void run() {
-        try {
-            response = getResponderImpl().onList(this);
-        } catch (Exception x) {
-            severe(getPath(), x);
-            close(x);
-        }
-        enqueueResponse();
-    }
-
-    @Override
-    public void onClose(Integer requestId) {
-        if (isClosed()) {
-            return;
-        }
-        state = STATE_CLOSED;
-        fine(finer() ? getPath() + " list closed" : null);
-        synchronized (this) {
-            updateHead = updateTail = null;
-        }
-        doClose();
-    }
-
-    @Override
-    public void write(DSIWriter out) {
-        enqueued = false;
-        if (isClosed()) {
-            return;
-        }
-        if (isClosePending() && (updateHead == null) && (closeReason != null)) {
-            ErrorResponse res = new ErrorResponse(closeReason);
-            res.parseRequest(getRequest());
-            res.write(out);
-            doClose();
-            return;
-        }
-        int last = state;
-        out.beginMap();
-        out.key("rid").value(getRequestId());
-        switch (state) {
-            case STATE_INIT:
-                out.key("updates").beginList();
-                writeInit(out);
-                break;
-            case STATE_CHILDREN:
-                out.key("updates").beginList();
-                writeChildren(out);
-                break;
-            case STATE_CLOSE_PENDING:
-            case STATE_UPDATES:
-                out.key("updates").beginList();
-                writeUpdates(out);
-                break;
-            default:
-                ;
-        }
-        out.endList();
-        if ((state != last) && (state == STATE_UPDATES)) {
-            out.key("stream").value("open");
-        } else if (isClosePending() && (updateHead == null)) {
-            if (closeReason != null) {
-                ErrorResponse res = new ErrorResponse(closeReason);
-                res.parseRequest(getRequest());
-                getResponder().sendResponse(res);
-            } else {
-                out.key("stream").value("closed");
-            }
-            doClose();
-        }
-        out.endMap();
-    }
-
-    private void writeChildren(DSIWriter out) {
-        if (children != null) {
-            ApiObject child;
-            while (children.hasNext()) {
-                child = children.next();
-                if (!child.isHidden()) {
-                    encodeChild(child, out);
-                }
-                if (getResponder().shouldEndMessage()) {
-                    enqueueResponse();
-                    return;
-                }
-            }
-        }
-        children = null;
-        state = STATE_UPDATES;
-    }
-
-    private void writeInit(DSIWriter out) {
-        ApiObject target = response.getTarget();
-        encodeTarget(target, out);
-        if (target.hasChildren()) {
-            state = STATE_CHILDREN;
-            children = target.getChildren();
-            writeChildren(out);
-        } else {
-            state = STATE_UPDATES;
-            writeUpdates(out);
-        }
-    }
-
-    private void writeUpdates(DSIWriter out) {
-        DS1Responder session = getResponder();
-        Update update = dequeue();
-        while (update != null) {
-            encodeUpdate(update, out);
-            if (session.shouldEndMessage()) {
-                enqueueResponse();
-                break;
-            }
-            update = dequeue();
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static class Update {
-
-        boolean added;
-        ApiObject child;
-        Update next;
-
-        Update(ApiObject child, boolean added) {
-            this.child = child;
-            this.added = added;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-} //Template
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundRequest.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundRequest.java
deleted file mode 100644
index def50b4c..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundRequest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
-
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Session;
-import org.iot.dsa.dslink.DSIResponder;
-import org.iot.dsa.dslink.responder.InboundRequest;
-import org.iot.dsa.logging.DSLogger;
-import org.iot.dsa.node.DSMap;
-
-/**
- * Getters and setters common to most requests.
- *
- * @author Aaron Hansen
- */
-class DS1InboundRequest extends DSLogger implements InboundRequest {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private String path;
-    private DS1Session session;
-    private DSMap request;
-    private Integer requestId;
-    private DSIResponder responderImpl;
-    private DS1Responder responder;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    DS1InboundRequest() {
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods in alphabetical order
-    ///////////////////////////////////////////////////////////////////////////
-
-    public String getPath() {
-        return path;
-    }
-
-    public DSMap getRequest() {
-        return request;
-    }
-
-    public DS1Responder getResponder() {
-        return responder;
-    }
-
-    public DSIResponder getResponderImpl() {
-        return responderImpl;
-    }
-
-    public Integer getRequestId() {
-        return requestId;
-    }
-
-    public DS1Session getSession() {
-        return session;
-    }
-
-    public DS1InboundRequest setPath(String path) {
-        this.path = path;
-        return this;
-    }
-
-    public DS1InboundRequest setSession(DS1Session session) {
-        this.session = session;
-        return this;
-    }
-
-    public DS1InboundRequest setRequest(DSMap request) {
-        this.request = request;
-        return this;
-    }
-
-    public DS1InboundRequest setResponderImpl(DSIResponder responderImpl) {
-        this.responderImpl = responderImpl;
-        return this;
-    }
-
-    public DS1InboundRequest setRequestId(Integer requestId) {
-        this.requestId = requestId;
-        return this;
-    }
-
-    public DS1InboundRequest setResponder(DS1Responder responder) {
-        this.responder = responder;
-        return this;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSet.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSet.java
deleted file mode 100644
index 667a8fed..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
-
-import com.acuity.iot.dsa.dslink.protocol.message.CloseMessage;
-import com.acuity.iot.dsa.dslink.protocol.message.ErrorResponse;
-import org.iot.dsa.dslink.responder.InboundSetRequest;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.node.DSMap;
-import org.iot.dsa.security.DSPermission;
-
-class DS1InboundSet extends DS1InboundRequest implements InboundSetRequest, Runnable {
-
-    private DSElement value;
-    private DSPermission permission;
-
-    DS1InboundSet(DSMap request) {
-        setRequest(request);
-        String permit = request.get("permit", "config");
-        permission = DSPermission.forString(permit);
-        value = request.get("value");
-    }
-
-    @Override
-    public DSPermission getPermission() {
-        return permission;
-    }
-
-    @Override
-    public DSElement getValue() {
-        return value;
-    }
-
-    @Override
-    public void run() {
-        try {
-            getResponderImpl().onSet(this);
-            getResponder().sendResponse(
-                    new CloseMessage(getRequestId()).setMethod(null).setStream("closed"));
-        } catch (Exception x) {
-            severe(getPath(), x);
-            ErrorResponse err = new ErrorResponse(x);
-            err.parseRequest(getRequest());
-            getResponder().sendResponse(err);
-        }
-    }
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSubscription.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSubscription.java
deleted file mode 100644
index 9a4176d9..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSubscription.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
-
-import com.acuity.iot.dsa.dslink.DSResponderSession;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.iot.dsa.dslink.responder.InboundSubscribeRequest;
-import org.iot.dsa.dslink.responder.SubscriptionCloseHandler;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSStatus;
-import org.iot.dsa.time.DSTime;
-
-/**
- * Subscribe implementation for the responder.
- *
- * @author Aaron Hansen
- */
-class DS1InboundSubscription extends DS1InboundRequest implements InboundSubscribeRequest {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private SubscriptionCloseHandler closeHandler;
-    private boolean enqueued = false;
-    private DS1InboundSubscriptions manager;
-    private boolean open = true;
-    private Integer sid;
-    private int qos = 0;
-    private Update updateHead;
-    private Update updateTail;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    DS1InboundSubscription(DS1InboundSubscriptions manager) {
-        this.manager = manager;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods in alphabetical order
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void close() {
-        manager.unsubscribe(sid);
-    }
-
-    /**
-     * Remove an update from the queue.
-     */
-    private synchronized Update dequeue() {
-        if (updateHead == null) {
-            return null;
-        }
-        Update ret = null;
-        ret = updateHead;
-        if (updateHead == updateTail) {
-            updateHead = updateTail = null;
-        } else {
-            updateHead = updateHead.next;
-        }
-        ret.next = null;
-        return ret;
-    }
-
-    @Override
-    public Logger getLogger() {
-        return manager.getLogger();
-    }
-
-    /**
-     * Unique subscription id for this path.
-     */
-    @Override
-    public Integer getSubscriptionId() {
-        return sid;
-    }
-
-    public void onClose() {
-        synchronized (this) {
-            if (!open) {
-                return;
-            }
-            open = false;
-        }
-        try {
-            if (closeHandler != null) {
-                closeHandler.onClose(getSubscriptionId());
-            }
-        } catch (Exception x) {
-            getLogger().log(Level.WARNING, toString(), x);
-        }
-    }
-
-    /**
-     * The responder should call this whenever the value or status changes.
-     */
-    @Override
-    public void update(long timestamp, DSIValue value, DSStatus quality) {
-        if (!open) {
-            return;
-        }
-        finest(finest() ? "Update " + getPath() + " to " + value : null);
-        if (qos <= 1) {
-            synchronized (this) {
-                if (updateHead == null) {
-                    updateHead = updateTail = new Update();
-                }
-                updateHead.set(timestamp, value, quality);
-                if (enqueued) {
-                    return;
-                }
-                enqueued = true;
-            }
-        } else {
-            Update update = new Update().set(timestamp, value, quality);
-            synchronized (this) {
-                if (updateHead == null) {
-                    updateHead = updateTail = update;
-                } else {
-                    updateTail.next = update;
-                }
-                if (enqueued) {
-                    return;
-                }
-                enqueued = true;
-            }
-        }
-        manager.enqueue(this);
-    }
-
-    DS1InboundSubscription setCloseHandler(SubscriptionCloseHandler closeHandler) {
-        this.closeHandler = closeHandler;
-        return this;
-    }
-
-    DS1InboundSubscription setQos(int qos) {
-        this.qos = qos;
-        return this;
-    }
-
-    DS1InboundSubscription setSubscriptionId(Integer sid) {
-        this.sid = sid;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "Subscription (" + getSubscriptionId() + ") " + getPath();
-    }
-
-    /**
-     * Encodes as many updates as possible.
-     *
-     * @param out Where to encode.
-     * @param buf For encoding timestamps.
-     */
-    void write(DSIWriter out, StringBuilder buf) {
-        //Don't check open state - forcefully closing will send an update
-        DSResponderSession session = getResponder();
-        Update update = dequeue();
-        while (update != null) {
-            out.beginMap();
-            out.key("sid").value(getSubscriptionId());
-            buf.setLength(0);
-            DSTime.encode(update.timestamp, true, buf);
-            out.key("ts").value(buf.toString());
-            out.key("value").value(update.value.toElement());
-            if ((update.quality != null) && !update.quality.isOk()) {
-                out.key("quality").value(update.quality.toString());
-            }
-            out.endMap();
-            if ((qos <= 1) || session.shouldEndMessage()) {
-                break;
-            }
-        }
-        synchronized (this) {
-            if (updateHead == null) {
-                if (qos <= 1) {
-                    //reuse instance
-                    updateHead = updateTail = update;
-                }
-                enqueued = false;
-                return;
-            }
-        }
-        manager.enqueue(this);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    private class Update {
-
-        Update next;
-        long timestamp;
-        DSIValue value;
-        DSStatus quality;
-
-        Update set(long timestamp, DSIValue value, DSStatus quality) {
-            this.timestamp = timestamp;
-            this.value = value;
-            this.quality = quality;
-            return this;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSubscriptions.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSubscriptions.java
deleted file mode 100644
index fe73d6d6..00000000
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundSubscriptions.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
-
-import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.logging.Logger;
-import org.iot.dsa.dslink.DSIResponder;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.logging.DSLogger;
-
-/**
- * Subscribe implementation for the responder.
- *
- * @author Aaron Hansen
- */
-class DS1InboundSubscriptions extends DSLogger implements OutboundMessage {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static final Integer ZERO = Integer.valueOf(0);
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private boolean enqueued = false;
-    private Logger logger;
-    private ConcurrentLinkedQueue<DS1InboundSubscription> outbound =
-            new ConcurrentLinkedQueue<DS1InboundSubscription>();
-    private Map<String, DS1InboundSubscription> pathMap =
-            new ConcurrentHashMap<String, DS1InboundSubscription>();
-    private DS1Responder session;
-    private Map<Integer, DS1InboundSubscription> sidMap =
-            new ConcurrentHashMap<Integer, DS1InboundSubscription>();
-    private StringBuilder timestampBuffer = new StringBuilder();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    DS1InboundSubscriptions(DS1Responder session) {
-        this.session = session;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods in alphabetical order
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Unsubscribes all.
-     */
-    void close() {
-        for (Integer i : sidMap.keySet()) {
-            unsubscribe(i);
-        }
-    }
-
-    /**
-     * Add to the outbound queue if not already enqueued.
-     */
-    void enqueue(DS1InboundSubscription subscription) {
-        synchronized (this) {
-            outbound.add(subscription);
-            if (enqueued) {
-                return;
-            }
-            enqueued = true;
-        }
-        session.sendResponse(this);
-    }
-
-    @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(session.getConnection().getLink().getLinkName()
-                                              + ".responderSubscriptions");
-        }
-        return logger;
-    }
-
-    /**
-     * Create or update a subscription.
-     */
-    void subscribe(DSIResponder responder, Integer sid, String path, int qos) {
-        finest(finest() ? "Subscribing " + path : null);
-        DS1InboundSubscription subscription = sidMap.get(sid);
-        if (subscription == null) {
-            subscription = new DS1InboundSubscription(this);
-            subscription.setSubscriptionId(sid).setQos(qos).setPath(path);
-            sidMap.put(sid, subscription);
-            pathMap.put(path, subscription);
-            subscription.setCloseHandler(responder.onSubscribe(subscription));
-        } else {
-            subscription.setQos(qos).setPath(path);
-        }
-    }
-
-    /**
-     * Remove the subscription and call onClose.
-     */
-    void unsubscribe(Integer sid) {
-        DS1InboundSubscription subscription = sidMap.remove(sid);
-        if (subscription != null) {
-            finest(finest() ? "Unsubscribing " + subscription.getPath() : null);
-            pathMap.remove(subscription.getPath());
-            try {
-                subscription.onClose();
-            } catch (Exception x) {
-                warn(warn() ? subscription.toString() : null, x);
-            }
-        }
-    }
-
-    @Override
-    public void write(DSIWriter out) {
-        out.beginMap();
-        out.key("rid").value(ZERO);
-        out.key("updates").beginList();
-        DS1InboundSubscription sub;
-        while (!session.shouldEndMessage()) {
-            sub = outbound.poll();
-            if (sub == null) {
-                break;
-            }
-            sub.write(out, timestampBuffer);
-        }
-        out.endList();
-        out.endMap();
-        timestampBuffer.setLength(0);
-        synchronized (this) {
-            if (outbound.isEmpty()) {
-                enqueued = false;
-                return;
-            }
-        }
-        session.sendResponse(this);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundInvokeStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundInvokeStub.java
similarity index 79%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundInvokeStub.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundInvokeStub.java
index 82a7c8e3..8114e9f8 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundInvokeStub.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundInvokeStub.java
@@ -1,5 +1,6 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
 import org.iot.dsa.dslink.requester.OutboundInvokeHandler;
 import org.iot.dsa.dslink.requester.OutboundInvokeHandler.Mode;
 import org.iot.dsa.io.DSIWriter;
@@ -12,7 +13,7 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-class DS1OutboundInvokeStub extends DS1OutboundStub {
+public class DSOutboundInvokeStub extends DSOutboundStub {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -25,11 +26,11 @@ class DS1OutboundInvokeStub extends DS1OutboundStub {
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1OutboundInvokeStub(DS1Requester requester,
-                                 Integer requestId,
-                                 String path,
-                                 DSMap params,
-                                 OutboundInvokeHandler handler) {
+    protected DSOutboundInvokeStub(DSRequester requester,
+                                   Integer requestId,
+                                   String path,
+                                   DSMap params,
+                                   OutboundInvokeHandler handler) {
         super(requester, requestId, path);
         this.params = params;
         this.handler = handler;
@@ -44,8 +45,15 @@ public OutboundInvokeHandler getHandler() {
         return handler;
     }
 
+    protected DSMap getParams() {
+        return params;
+    }
+
+    /**
+     * Writes the v1 response by default.  V2 probably only needs to add some headers.
+     */
     @Override
-    protected void handleResponse(DSMap response) {
+    public void handleResponse(DSMap response) {
         try {
             DSList updates = response.getList("updates");
             DSMap meta = response.getMap("meta");
@@ -93,16 +101,19 @@ protected void handleResponse(DSMap response) {
                 handler.onUpdate(updates.get(i).toList());
             }
         } catch (Exception x) {
-            getRequester().severe(getRequester().getPath(), x);
+            getRequester().error(getRequester().getPath(), x);
         }
     }
 
+    /**
+     * Writes the v1 version by default.
+     */
     @Override
-    public void write(DSIWriter out) {
+    public void write(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         out.beginMap();
         out.key("rid").value(getRequestId());
         out.key("method").value("invoke");
-        out.key("permit").value("config");
         out.key("path").value(getPath());
         if (params == null) {
             params = new DSMap();
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundListStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundListStub.java
similarity index 75%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundListStub.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundListStub.java
index 7e084656..eab7e651 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundListStub.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundListStub.java
@@ -1,11 +1,13 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
 import org.iot.dsa.dslink.DSRequestException;
 import org.iot.dsa.dslink.requester.OutboundListHandler;
 import org.iot.dsa.io.DSIWriter;
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSPath;
 
 /**
  * Manages the lifecycle of an list request and is also the outbound stream passed to the
@@ -13,7 +15,7 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-class DS1OutboundListStub extends DS1OutboundStub {
+public class DSOutboundListStub extends DSOutboundStub {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -25,10 +27,10 @@ class DS1OutboundListStub extends DS1OutboundStub {
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1OutboundListStub(DS1Requester requester,
-                               Integer requestId,
-                               String path,
-                               OutboundListHandler request) {
+    protected DSOutboundListStub(DSRequester requester,
+                                 Integer requestId,
+                                 String path,
+                                 OutboundListHandler request) {
         super(requester, requestId, path);
         this.request = request;
     }
@@ -42,8 +44,11 @@ public OutboundListHandler getHandler() {
         return request;
     }
 
+    /**
+     * Reads the v1 response.
+     */
     @Override
-    protected void handleResponse(DSMap response) {
+    public void handleResponse(DSMap response) {
         try {
             DSList updates = response.getList("updates");
             if (updates != null) {
@@ -54,7 +59,7 @@ protected void handleResponse(DSMap response) {
                     if (elem.isList()) {
                         list = (DSList) elem;
                         name = list.getString(0);
-                        request.onUpdate(name, list.get(1));
+                        request.onUpdate(DSPath.decodeName(name), list.get(1));
                     } else if (elem.isMap()) {
                         map = (DSMap) elem;
                         name = map.getString("name");
@@ -72,12 +77,16 @@ protected void handleResponse(DSMap response) {
                 request.onInitialized();
             }
         } catch (Exception x) {
-            getRequester().severe(getRequester().getPath(), x);
+            getRequester().error(getRequester().getPath(), x);
         }
     }
 
+    /**
+     * Writes the v1 request.
+     */
     @Override
-    public void write(DSIWriter out) {
+    public void write(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         out.beginMap();
         out.key("rid").value(getRequestId());
         out.key("method").value("list");
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundRemoveStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundRemoveStub.java
similarity index 66%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundRemoveStub.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundRemoveStub.java
index 533e225c..836d0f3e 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundRemoveStub.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundRemoveStub.java
@@ -1,5 +1,6 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
 import org.iot.dsa.dslink.requester.OutboundRequestHandler;
 import org.iot.dsa.io.DSIWriter;
 import org.iot.dsa.node.DSMap;
@@ -10,7 +11,7 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-class DS1OutboundRemoveStub extends DS1OutboundStub {
+public class DSOutboundRemoveStub extends DSOutboundStub {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -22,10 +23,10 @@ class DS1OutboundRemoveStub extends DS1OutboundStub {
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1OutboundRemoveStub(DS1Requester requester,
-                                 Integer requestId,
-                                 String path,
-                                 OutboundRequestHandler request) {
+    protected DSOutboundRemoveStub(DSRequester requester,
+                                   Integer requestId,
+                                   String path,
+                                   OutboundRequestHandler request) {
         super(requester, requestId, path);
         this.request = request;
     }
@@ -38,12 +39,19 @@ public OutboundRequestHandler getHandler() {
         return request;
     }
 
+    /**
+     * Does nothing.
+     */
     @Override
-    protected void handleResponse(DSMap map) {
+    public void handleResponse(DSMap response) {
     }
 
+    /**
+     * Writes the v1 version.
+     */
     @Override
-    public void write(DSIWriter out) {
+    public void write(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         out.beginMap();
         out.key("rid").value(getRequestId());
         out.key("method").value("remove");
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSetStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSetStub.java
similarity index 65%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSetStub.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSetStub.java
index 6b5ca980..1917918a 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSetStub.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSetStub.java
@@ -1,5 +1,6 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
 import org.iot.dsa.dslink.requester.OutboundRequestHandler;
 import org.iot.dsa.io.DSIWriter;
 import org.iot.dsa.node.DSIValue;
@@ -10,7 +11,7 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-class DS1OutboundSetStub extends DS1OutboundStub {
+public class DSOutboundSetStub extends DSOutboundStub {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -23,11 +24,11 @@ class DS1OutboundSetStub extends DS1OutboundStub {
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1OutboundSetStub(DS1Requester requester,
-                              Integer requestId,
-                              String path,
-                              DSIValue value,
-                              OutboundRequestHandler request) {
+    protected DSOutboundSetStub(DSRequester requester,
+                                Integer requestId,
+                                String path,
+                                DSIValue value,
+                                OutboundRequestHandler request) {
         super(requester, requestId, path);
         this.value = value;
         this.request = request;
@@ -41,12 +42,23 @@ public OutboundRequestHandler getHandler() {
         return request;
     }
 
+    protected DSIValue getValue() {
+        return value;
+    }
+
+    /**
+     * Does nothing, there is no response.
+     */
     @Override
-    protected void handleResponse(DSMap map) {
+    public void handleResponse(DSMap response) {
     }
 
+    /**
+     * Writes the v1 request.
+     */
     @Override
-    public void write(DSIWriter out) {
+    public void write(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         out.beginMap();
         out.key("rid").value(getRequestId());
         out.key("method").value("set");
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundStub.java
similarity index 64%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundStub.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundStub.java
index 823f8e39..03ffe1d0 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundStub.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundStub.java
@@ -1,9 +1,10 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
 import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import org.iot.dsa.dslink.requester.ErrorType;
 import org.iot.dsa.dslink.requester.OutboundRequestHandler;
 import org.iot.dsa.dslink.requester.OutboundStream;
-import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSMap;
 
 /**
@@ -12,7 +13,7 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-abstract class DS1OutboundStub implements OutboundMessage, OutboundStream {
+public abstract class DSOutboundStub implements OutboundMessage, OutboundStream {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -20,14 +21,14 @@ abstract class DS1OutboundStub implements OutboundMessage, OutboundStream {
 
     private String path;
     private boolean open = true;
-    private DS1Requester requester;
+    private DSRequester requester;
     private Integer requestId;
 
     ///////////////////////////////////////////////////////////////////////////
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    DS1OutboundStub(DS1Requester requester, Integer requestId, String path) {
+    DSOutboundStub(DSRequester requester, Integer requestId, String path) {
         this.requester = requester;
         this.requestId = requestId;
         this.path = path;
@@ -52,7 +53,7 @@ public String getPath() {
         return path;
     }
 
-    public DS1Requester getRequester() {
+    public DSRequester getRequester() {
         return requester;
     }
 
@@ -60,7 +61,11 @@ public Integer getRequestId() {
         return requestId;
     }
 
-    protected void handleClose() {
+    public DSSession getSession() {
+        return requester.getSession();
+    }
+
+    public void handleClose() {
         if (!open) {
             return;
         }
@@ -68,34 +73,26 @@ protected void handleClose() {
         try {
             getHandler().onClose();
         } catch (Exception x) {
-            getRequester().severe(getRequester().getPath(), x);
+            getRequester().error(getRequester().getPath(), x);
         }
         getRequester().removeRequest(getRequestId());
     }
 
-    protected void handleError(DSElement details) {
+    public void handleError(ErrorType type, String message) {
         if (!open) {
             return;
         }
         try {
-            String type = null;
-            String msg = null;
-            String detail = null;
-            if (details.isMap()) {
-                DSMap map = details.toMap();
-                type = map.getString("type");
-                msg = map.getString("msg");
-                detail = map.getString("detail");
-            } else {
-                msg = details.toString();
-            }
-            getHandler().onError(type, msg, detail);
+            getHandler().onError(type, message);
         } catch (Exception x) {
-            getRequester().severe(getRequester().getPath(), x);
+            getRequester().error(getRequester().getPath(), x);
         }
     }
 
-    protected abstract void handleResponse(DSMap map);
+    /**
+     * Handle the V1 response map.
+     */
+    public abstract void handleResponse(DSMap map);
 
     public boolean isStreamOpen() {
         return open;
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscribeStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStub.java
similarity index 77%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscribeStub.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStub.java
index c7ab4780..7304b75f 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscribeStub.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStub.java
@@ -1,4 +1,4 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
 import org.iot.dsa.dslink.requester.OutboundStream;
 import org.iot.dsa.dslink.requester.OutboundSubscribeHandler;
@@ -13,28 +13,28 @@
  * <p>
  *
  * There can be multiple subscriptions to a single path.  They are all contained in a
- * DS1OutboundSubscribeStubs object.
+ * DSOutboundSubscribeStubs object.
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-class DS1OutboundSubscribeStub implements OutboundStream {
+class DSOutboundSubscribeStub implements OutboundStream {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private DS1OutboundSubscribeStub next; //linked list in stubs object
+    private DSOutboundSubscribeStub next; //linked list in stubs object
     private boolean open = true;
     private String path;
     private int qos = 0;
     private OutboundSubscribeHandler request;
-    private DS1OutboundSubscribeStubs stubs;
+    private DSOutboundSubscribeStubs stubs;
 
     ///////////////////////////////////////////////////////////////////////////
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1OutboundSubscribeStub(String path, int qos, OutboundSubscribeHandler request) {
+    public DSOutboundSubscribeStub(String path, int qos, OutboundSubscribeHandler request) {
         this.path = path;
         this.qos = qos;
         this.request = request;
@@ -56,11 +56,11 @@ public void closeStream() {
         try {
             request.onClose();
         } catch (Exception x) {
-            stubs.getSubscriptions().severe(path, x);
+            stubs.getSubscriptions().error(path, x);
         }
     }
 
-    public DS1OutboundSubscribeStub getNext() {
+    public DSOutboundSubscribeStub getNext() {
         return next;
     }
 
@@ -84,18 +84,18 @@ public void process(DSDateTime ts, DSElement value, DSStatus status) {
         try {
             request.onUpdate(ts, value, status);
         } catch (Exception x) {
-            stubs.getSubscriptions().severe(path, x);
+            stubs.getSubscriptions().error(path, x);
         }
     }
 
     /**
      * The next stub in the parents stubs object.
      */
-    void setNext(DS1OutboundSubscribeStub next) {
+    void setNext(DSOutboundSubscribeStub next) {
         this.next = next;
     }
 
-    void setStubs(DS1OutboundSubscribeStubs stubs) {
+    void setStubs(DSOutboundSubscribeStubs stubs) {
         this.stubs = stubs;
     }
 
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscribeStubs.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStubs.java
similarity index 78%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscribeStubs.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStubs.java
index 4465c6cf..356d231b 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1OutboundSubscribeStubs.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscribeStubs.java
@@ -1,4 +1,4 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSStatus;
@@ -9,14 +9,14 @@
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-class DS1OutboundSubscribeStubs {
+class DSOutboundSubscribeStubs {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private DS1OutboundSubscribeStub first;
-    private DS1OutboundSubscribeStub last;
+    private DSOutboundSubscribeStub first;
+    private DSOutboundSubscribeStub last;
     private DSStatus lastStatus;
     private DSDateTime lastTs;
     private DSElement lastValue;
@@ -25,18 +25,16 @@ class DS1OutboundSubscribeStubs {
     private Integer sid;
     private int size;
     private State state = State.PENDING_SUBSCRIBE;
-    private DS1OutboundSubscriptions subscriptions;
+    private DSOutboundSubscriptions subscriptions;
 
     ///////////////////////////////////////////////////////////////////////////
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1OutboundSubscribeStubs(
+    public DSOutboundSubscribeStubs(
             String path,
-            Integer sid,
-            DS1OutboundSubscriptions subscriptions) {
+            DSOutboundSubscriptions subscriptions) {
         this.path = path;
-        this.sid = sid;
         this.subscriptions = subscriptions;
     }
 
@@ -47,7 +45,7 @@ public DS1OutboundSubscribeStubs(
     /**
      * If already subscribed, will pass the last update to the new subscriber.
      */
-    void add(DS1OutboundSubscribeStub stub) {
+    void add(DSOutboundSubscribeStub stub) {
         if (stub.getQos() > qos) {
             qos = stub.getQos();
         }
@@ -68,24 +66,13 @@ void add(DS1OutboundSubscribeStub stub) {
                 try {
                     stub.process(lastTs, lastValue, lastStatus);
                 } catch (Exception x) {
-                    subscriptions.severe(path, x);
+                    subscriptions.error(path, x);
                 }
             }
         }
     }
 
-    public void close() {
-        //TODO who calls this and for what purpose
-        /*
-        DS1OutboundSubscribeStub cur = first;
-        while (cur != null) {
-            cur.close();
-            cur = cur.getNext();
-        }
-        */
-    }
-
-    private boolean contains(DS1OutboundSubscribeStub stub) {
+    private boolean contains(DSOutboundSubscribeStub stub) {
         if (stub == first) {
             return true;
         }
@@ -108,21 +95,33 @@ public State getState() {
         return state;
     }
 
-    public DS1OutboundSubscriptions getSubscriptions() {
+    public DSOutboundSubscriptions getSubscriptions() {
         return subscriptions;
     }
 
+    public boolean hasSid() {
+        return sid != null;
+    }
+
+    public void onDisconnect() {
+        DSOutboundSubscribeStub cur = first;
+        while (cur != null) {
+            cur.closeStream();
+            cur = cur.getNext();
+        }
+    }
+
     /**
      * Null if the arg is the first in the list, last if stub is not contained.
      */
-    private DS1OutboundSubscribeStub predecessor(DS1OutboundSubscribeStub stub) {
+    private DSOutboundSubscribeStub predecessor(DSOutboundSubscribeStub stub) {
         if (first == null) {
             return null;
         }
         if (stub == first) {
             return null;
         }
-        DS1OutboundSubscribeStub cur = first;
+        DSOutboundSubscribeStub cur = first;
         while (cur.getNext() != null) {
             if (cur.getNext() == stub) {
                 return cur;
@@ -133,12 +132,12 @@ private DS1OutboundSubscribeStub predecessor(DS1OutboundSubscribeStub stub) {
     }
 
     void process(DSDateTime ts, DSElement value, DSStatus status) {
-        DS1OutboundSubscribeStub stub = first;
+        DSOutboundSubscribeStub stub = first;
         while (stub != null) {
             try {
                 stub.process(ts, value, status);
             } catch (Exception x) {
-                subscriptions.severe(path, x);
+                subscriptions.error(path, x);
             }
             stub = stub.getNext();
         }
@@ -147,8 +146,8 @@ void process(DSDateTime ts, DSElement value, DSStatus status) {
         lastStatus = status;
     }
 
-    void remove(DS1OutboundSubscribeStub stub) {
-        DS1OutboundSubscribeStub pred = predecessor(stub);
+    void remove(DSOutboundSubscribeStub stub) {
+        DSOutboundSubscribeStub pred = predecessor(stub);
         if (pred == last) { //not contained
             return;
         }
@@ -168,6 +167,11 @@ void remove(DS1OutboundSubscribeStub stub) {
         }
     }
 
+    public DSOutboundSubscribeStubs setSid(Integer sid) {
+        this.sid = sid;
+        return this;
+    }
+
     void setState(State state) {
         this.state = state;
     }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscriptions.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscriptions.java
new file mode 100644
index 00000000..ee472b9e
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSOutboundSubscriptions.java
@@ -0,0 +1,270 @@
+package com.acuity.iot.dsa.dslink.protocol.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundSubscribeStubs.State;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import org.iot.dsa.dslink.requester.OutboundSubscribeHandler;
+import org.iot.dsa.io.DSIWriter;
+import org.iot.dsa.logging.DSLogger;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSNull;
+import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.time.DSDateTime;
+
+/**
+ * Manages all subscriptions for a requester.
+ *
+ * @author Aaron Hansen
+ */
+public class DSOutboundSubscriptions extends DSLogger implements OutboundMessage {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    static final int MAX_SID = 2147483647;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private boolean enqueued = false;
+    private int nextSid = 1;
+    private final ConcurrentLinkedQueue<DSOutboundSubscribeStubs> pendingSubscribe =
+            new ConcurrentLinkedQueue<DSOutboundSubscribeStubs>();
+    private final ConcurrentLinkedQueue<DSOutboundSubscribeStubs> pendingUnsubscribe =
+            new ConcurrentLinkedQueue<DSOutboundSubscribeStubs>();
+    private final Map<String, DSOutboundSubscribeStubs> pathMap =
+            new ConcurrentHashMap<String, DSOutboundSubscribeStubs>();
+    private DSRequester requester;
+    private final Map<Integer, DSOutboundSubscribeStubs> sidMap =
+            new ConcurrentHashMap<Integer, DSOutboundSubscribeStubs>();
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    protected DSOutboundSubscriptions(DSRequester requester) {
+        this.requester = requester;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Override point for v2.
+     */
+    protected void doBeginSubscribe(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
+        out.beginMap();
+        out.key("rid").value(requester.getNextRid());
+        out.key("method").value("subscribe");
+        out.key("paths").beginList();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void doBeginUnsubscribe(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
+        out.beginMap();
+        out.key("rid").value(requester.getNextRid());
+        out.key("method").value("unsubscribe");
+        out.key("sids").beginList();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void doEndMessage(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
+        out.endList();
+        out.endMap();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void doWriteSubscribe(MessageWriter writer, String path, Integer sid, int qos) {
+        DSIWriter out = writer.getWriter();
+        out.beginMap();
+        out.key("path").value(path);
+        out.key("sid").value(sid);
+        if (qos > 0) {
+            out.key("qos").value(qos);
+        }
+        out.endMap();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void doWriteUnsubscribe(MessageWriter writer, Integer sid) {
+        DSIWriter out = writer.getWriter();
+        out.value(sid);
+    }
+
+    /**
+     * This is already synchronized by the subscribe method.
+     */
+    private int getNextSid() {
+        int ret = nextSid;
+        if (++nextSid > MAX_SID) {
+            nextSid = 1;
+        }
+        return ret;
+    }
+
+    public DSRequester getRequester() {
+        return requester;
+    }
+
+    public void onConnect() {
+    }
+
+    public void onConnectFail() {
+    }
+
+    public void onDisconnect() {
+        for (DSOutboundSubscribeStubs stubs : pendingSubscribe) {
+            stubs.onDisconnect();
+        }
+        pendingSubscribe.clear();
+        pendingUnsubscribe.clear();
+        for (DSOutboundSubscribeStubs stubs : pathMap.values()) {
+            stubs.onDisconnect();
+        }
+        sidMap.clear();
+        pathMap.clear();
+    }
+
+    public void handleUpdate(int sid, String ts, String sts, DSElement value) {
+        if (sid < 0) {
+            debug(debug() ? "Update missing sid" : null);
+            return;
+        }
+        DSOutboundSubscribeStubs stub = sidMap.get(sid);
+        if (stub == null) {
+            debug(debug() ? ("Unexpected subscription sid " + sid) : null);
+            return;
+        }
+        DSDateTime timestamp = null;
+        if ((ts == null) || ts.isEmpty()) {
+            timestamp = DSDateTime.currentTime();
+        } else {
+            timestamp = DSDateTime.valueOf(ts);
+        }
+        DSStatus status = DSStatus.ok;
+        if (sts != null) {
+            status = DSStatus.valueOf(sts);
+        }
+        if (value == null) {
+            value = DSNull.NULL;
+        }
+        stub.process(timestamp, value, status);
+    }
+
+    private void sendMessage() {
+        synchronized (this) {
+            if (enqueued) {
+                return;
+            }
+            enqueued = true;
+        }
+        requester.sendRequest(this);
+    }
+
+    /**
+     * Create or update a subscription.
+     */
+    OutboundSubscribeHandler subscribe(String path, int qos, OutboundSubscribeHandler req) {
+        DSOutboundSubscribeStub stub = new DSOutboundSubscribeStub(path, qos, req);
+        DSOutboundSubscribeStubs stubs = null;
+        synchronized (pathMap) {
+            stubs = pathMap.get(path);
+            if (stubs == null) {
+                stubs = new DSOutboundSubscribeStubs(path, this);
+                stubs.add(stub);
+                pathMap.put(path, stubs);
+                pendingSubscribe.add(stubs);
+            } else {
+                stubs.add(stub);
+                stubs.setState(State.PENDING_SUBSCRIBE);
+                pendingSubscribe.add(stubs);
+            }
+        }
+        try {
+            req.onInit(path, stubs.getQos(), stub);
+        } catch (Exception x) {
+            error(path, x);
+        }
+        sendMessage();
+        return req;
+    }
+
+    /**
+     * Remove the subscription and call onClose.
+     */
+    void unsubscribe(DSOutboundSubscribeStubs stubs) {
+        synchronized (pathMap) {
+            if (stubs.size() == 0) {
+                stubs.setState(State.PENDING_UNSUBSCRIBE);
+                pendingUnsubscribe.add(stubs);
+                sendMessage();
+            }
+        }
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DSSession session = requester.getSession();
+        if (!pendingSubscribe.isEmpty()) {
+            doBeginSubscribe(writer);
+            Iterator<DSOutboundSubscribeStubs> it = pendingSubscribe.iterator();
+            while (it.hasNext() && !session.shouldEndMessage()) {
+                DSOutboundSubscribeStubs stubs = it.next();
+                if (!stubs.hasSid()) {
+                    synchronized (pathMap) {
+                        stubs.setSid(getNextSid());
+                        sidMap.put(stubs.getSid(), stubs);
+                    }
+                }
+                if (stubs.getState() == State.PENDING_SUBSCRIBE) {
+                    doWriteSubscribe(writer, stubs.getPath(), stubs.getSid(), stubs.getQos());
+                    stubs.setState(State.SUBSCRIBED);
+                }
+                it.remove();
+            }
+            doEndMessage(writer);
+        }
+        if (!pendingUnsubscribe.isEmpty() && !session.shouldEndMessage()) {
+            doBeginUnsubscribe(writer);
+            Iterator<DSOutboundSubscribeStubs> it = pendingUnsubscribe.iterator();
+            while (it.hasNext() && !session.shouldEndMessage()) {
+                DSOutboundSubscribeStubs stubs = it.next();
+                synchronized (pathMap) {
+                    if (stubs.size() == 0) {
+                        pathMap.remove(stubs.getPath());
+                        sidMap.remove(stubs.getSid());
+                        doWriteUnsubscribe(writer, stubs.getSid());
+                    }
+                }
+                it.remove();
+            }
+            doEndMessage(writer);
+        }
+        synchronized (this) {
+            enqueued = false;
+        }
+        if (!pendingSubscribe.isEmpty() || !pendingUnsubscribe.isEmpty()) {
+            sendMessage();
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1Requester.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSRequester.java
similarity index 50%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1Requester.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSRequester.java
index d324c54d..b6e9b057 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/requester/DS1Requester.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/requester/DSRequester.java
@@ -1,9 +1,11 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.requester;
+package com.acuity.iot.dsa.dslink.protocol.requester;
 
-import com.acuity.iot.dsa.dslink.protocol.message.CloseMessage;
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
 import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Session;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.iot.dsa.dslink.DSIRequester;
@@ -11,34 +13,31 @@
 import org.iot.dsa.dslink.requester.OutboundListHandler;
 import org.iot.dsa.dslink.requester.OutboundRequestHandler;
 import org.iot.dsa.dslink.requester.OutboundSubscribeHandler;
-import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 
 /**
- * DSA V1 requester implementation.
+ * DSA requester abstraction.
  *
  * @author Daniel Shapiro, Aaron Hansen
  */
-public class DS1Requester extends DSNode implements DSIRequester {
+public abstract class DSRequester extends DSNode implements DSIRequester {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private final AtomicInteger nextRid = new AtomicInteger();
-    private DS1Session session;
-    private final Map<Integer, DS1OutboundStub> requests =
-            new ConcurrentHashMap<Integer, DS1OutboundStub>();
-    private final DS1OutboundSubscriptions subscriptions =
-            new DS1OutboundSubscriptions(this);
+    private AtomicInteger nextRid = new AtomicInteger();
+    private DSSession session;
+    private Map<Integer, DSOutboundStub> requests = new ConcurrentHashMap<Integer, DSOutboundStub>();
+    private DSOutboundSubscriptions subscriptions = makeSubscriptions();
 
     ///////////////////////////////////////////////////////////////////////////
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    public DS1Requester(DS1Session session) {
+    public DSRequester(DSSession session) {
         this.session = session;
     }
 
@@ -46,45 +45,80 @@ public DS1Requester(DS1Session session) {
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    int getNextRid() {
+    protected int getNextRid() {
         return nextRid.incrementAndGet();
     }
 
-    DS1Session getSession() {
+    protected DSOutboundStub getRequest(Integer rid) {
+        return requests.get(rid);
+    }
+
+    public DSSession getSession() {
         return session;
     }
 
+    protected DSOutboundSubscriptions getSubscriptions() {
+        return subscriptions;
+    }
+
+    public DSTransport getTransport() {
+        return getSession().getTransport();
+    }
+
+    /**
+     * V2 Override point.
+     */
+    protected DSOutboundSubscriptions makeSubscriptions() {
+        return new DSOutboundSubscriptions(this);
+    }
+
     @Override
     public OutboundInvokeHandler invoke(String path, DSMap params, OutboundInvokeHandler req) {
-        DS1OutboundInvokeStub stub = new DS1OutboundInvokeStub(this, getNextRid(),
-                                                               path, params, req);
+        DSOutboundInvokeStub stub = makeInvoke(path, params, req);
         requests.put(stub.getRequestId(), stub);
         req.onInit(path, params, stub);
         session.enqueueOutgoingRequest(stub);
         return req;
     }
 
-    boolean isError(DSMap message) {
-        DSElement e = message.get("error");
-        if (e == null) {
-            return false;
-        }
-        return !e.isNull();
-    }
-
-    boolean isStreamClosed(DSMap message) {
-        return "closed".equals(message.getString("stream"));
-    }
-
     @Override
     public OutboundListHandler list(String path, OutboundListHandler req) {
-        DS1OutboundListStub stub = new DS1OutboundListStub(this, getNextRid(), path, req);
+        DSOutboundListStub stub = makeList(path, req);
         requests.put(stub.getRequestId(), stub);
         req.onInit(path, stub);
         session.enqueueOutgoingRequest(stub);
         return req;
     }
 
+    /**
+     * For V2 override.
+     */
+    protected DSOutboundListStub makeList(String path, OutboundListHandler req) {
+        return new DSOutboundListStub(this, getNextRid(), path, req);
+    }
+
+    /**
+     * For V2 override.
+     */
+    protected DSOutboundInvokeStub makeInvoke(String path, DSMap params,
+                                              OutboundInvokeHandler req) {
+        return new DSOutboundInvokeStub(this, getNextRid(), path, params, req);
+    }
+
+    /**
+     * For V2 override.
+     */
+    protected DSOutboundRemoveStub makeRemove(String path, OutboundRequestHandler req) {
+        return new DSOutboundRemoveStub(this, getNextRid(), path, req);
+    }
+
+    /**
+     * For V2 override.
+     */
+    protected DSOutboundSetStub makeSet(String path, DSIValue value, OutboundRequestHandler req) {
+        return new DSOutboundSetStub(this, getNextRid(), path, value, req);
+    }
+
     public void onConnect() {
         subscriptions.onConnect();
     }
@@ -95,59 +129,40 @@ public void onConnectFail() {
 
     public void onDisconnect() {
         subscriptions.onDisconnect();
-    }
-
-    /**
-     * Call by the parent session to handle response messages.
-     */
-    public void processResponse(Integer rid, DSMap map) {
-        if (rid == 0) {
-            subscriptions.processUpdates(map);
-        } else {
-            DS1OutboundStub stub = requests.get(rid);
-            if (stub != null) {
-                stub.handleResponse(map);
-                if (isError(map)) {
-                    stub.handleError(map.get("error"));
-                }
-                if (isStreamClosed(map)) {
-                    stub.handleClose();
-                    requests.remove(rid);
-                }
-            } else {
-                if (!isStreamClosed(map)) {
-                    sendClose(rid);
-                }
+        Iterator<Entry<Integer, DSOutboundStub>> it = requests.entrySet().iterator();
+        Map.Entry<Integer, DSOutboundStub> me;
+        while (it.hasNext()) {
+            me = it.next();
+            try {
+                me.getValue().getHandler().onClose();
+            } catch (Exception x) {
+                error(getPath(), x);
             }
+            it.remove();
         }
     }
 
     @Override
     public OutboundRequestHandler remove(String path, OutboundRequestHandler req) {
-        DS1OutboundRemoveStub stub = new DS1OutboundRemoveStub(this,
-                                                               getNextRid(), path, req);
+        DSOutboundRemoveStub stub = makeRemove(path, req);
         requests.put(stub.getRequestId(), stub);
         session.enqueueOutgoingRequest(stub);
         return req;
     }
 
-    void removeRequest(Integer rid) {
+    public void removeRequest(Integer rid) {
         requests.remove(rid);
     }
 
-    void sendClose(Integer rid) {
-        requests.remove(rid);
-        sendRequest(new CloseMessage(rid));
-    }
+    protected abstract void sendClose(Integer rid);
 
-    void sendRequest(OutboundMessage res) {
+    public void sendRequest(OutboundMessage res) {
         session.enqueueOutgoingRequest(res);
     }
 
     @Override
     public OutboundRequestHandler set(String path, DSIValue value, OutboundRequestHandler req) {
-        DS1OutboundSetStub stub = new DS1OutboundSetStub(this, getNextRid(),
-                                                         path, value, req);
+        DSOutboundSetStub stub = makeSet(path, value, req);
         requests.put(stub.getRequestId(), stub);
         session.enqueueOutgoingRequest(stub);
         return req;
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundInvoke.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundInvoke.java
similarity index 70%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundInvoke.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundInvoke.java
index f6ce3ac3..26a014a9 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1InboundInvoke.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundInvoke.java
@@ -1,19 +1,25 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
+package com.acuity.iot.dsa.dslink.protocol.responder;
 
-import com.acuity.iot.dsa.dslink.protocol.message.ErrorResponse;
+import com.acuity.iot.dsa.dslink.protocol.DSStream;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
 import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Stream;
+import com.acuity.iot.dsa.dslink.protocol.message.RequestPath;
 import java.util.Iterator;
 import org.iot.dsa.DSRuntime;
+import org.iot.dsa.dslink.DSIResponder;
+import org.iot.dsa.dslink.DSPermissionException;
+import org.iot.dsa.dslink.DSRequestException;
 import org.iot.dsa.dslink.responder.InboundInvokeRequest;
 import org.iot.dsa.io.DSIWriter;
 import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.action.ActionResult;
 import org.iot.dsa.node.action.ActionSpec;
 import org.iot.dsa.node.action.ActionTable;
 import org.iot.dsa.node.action.ActionValues;
+import org.iot.dsa.node.action.DSAction;
 import org.iot.dsa.security.DSPermission;
 
 /**
@@ -21,8 +27,8 @@
  *
  * @author Aaron Hansen
  */
-class DS1InboundInvoke extends DS1InboundRequest
-        implements DS1Stream, InboundInvokeRequest, OutboundMessage, Runnable {
+public class DSInboundInvoke extends DSInboundRequest
+        implements DSStream, InboundInvokeRequest, OutboundMessage, Runnable {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
@@ -44,6 +50,7 @@ class DS1InboundInvoke extends DS1InboundRequest
     private DSPermission permission;
     private ActionResult result;
     private Iterator<DSList> rows;
+    private boolean stream = true;
     private int state = STATE_INIT;
     private Update updateHead;
     private Update updateTail;
@@ -52,11 +59,9 @@ class DS1InboundInvoke extends DS1InboundRequest
     // Constructors
     ///////////////////////////////////////////////////////////////////////////
 
-    DS1InboundInvoke(DSMap request) {
-        setRequest(request);
-        String permit = request.get("permit", "config");
-        permission = DSPermission.forString(permit);
-        parameters = request.getMap("params");
+    public DSInboundInvoke(DSMap parameters, DSPermission permission) {
+        this.parameters = parameters;
+        this.permission = permission;
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -75,7 +80,7 @@ public void close() {
         }
         state = STATE_CLOSE_PENDING;
         enqueueResponse();
-        fine(fine() ? getPath() + " list closed locally" : null);
+        fine(fine() ? getPath() + " invoke closed locally" : null);
     }
 
     @Override
@@ -86,7 +91,7 @@ public void close(Exception reason) {
         closeReason = reason;
         state = STATE_CLOSE_PENDING;
         enqueueResponse();
-        fine(fine() ? getPath() + " list closed locally" : null);
+        fine(fine() ? getPath() + " invoke closed locally" : null);
     }
 
     private synchronized Update dequeueUpdate() {
@@ -109,7 +114,7 @@ private synchronized Update dequeueUpdate() {
      */
     private void doClose() {
         state = STATE_CLOSED;
-        getResponder().removeInboundRequest(getRequestId());
+        getResponder().removeRequest(getRequestId());
         if (result == null) {
             return;
         }
@@ -119,7 +124,7 @@ public void run() {
                 try {
                     result.onClose();
                 } catch (Exception x) {
-                    severe(getPath(), x);
+                    error(getPath(), x);
                 }
             }
         });
@@ -157,22 +162,6 @@ private void enqueueResponse() {
         getResponder().sendResponse(this);
     }
 
-    /**
-     * Invokes the action and will then enqueueUpdate the outgoing response.
-     */
-    public void run() {
-        try {
-            result = getResponderImpl().onInvoke(this);
-            if (result == null) {
-                close();
-            }
-        } catch (Exception x) {
-            severe(getPath(), x);
-            close(x);
-        }
-        enqueueResponse();
-    }
-
     /**
      * Any parameters supplied by the requester for the invocation, or null.
      */
@@ -186,6 +175,13 @@ public DSPermission getPermission() {
         return permission;
     }
 
+    /**
+     * Returns "updates" for v1.
+     */
+    private String getRowsName() {
+        return "updates";
+    }
+
     @Override
     public void insert(int index, DSList[] rows) {
         enqueueUpdate(new Update(rows, index, -1, UpdateType.INSERT));
@@ -195,7 +191,7 @@ public boolean isClosed() {
         return state == STATE_CLOSED;
     }
 
-    public boolean isClosePending() {
+    private boolean isClosePending() {
         return state == STATE_CLOSE_PENDING;
     }
 
@@ -210,7 +206,7 @@ public void onClose(Integer requestId) {
             return;
         }
         state = STATE_CLOSED;
-        fine(finer() ? getPath() + " invoke closed" : null);
+        fine(debug() ? getPath() + " invoke closed" : null);
         synchronized (this) {
             updateHead = updateTail = null;
         }
@@ -226,55 +222,120 @@ public void replace(int index, int len, DSList... rows) {
         enqueueUpdate(new Update(rows, index, len, UpdateType.REPLACE));
     }
 
+    /**
+     * Invokes the action and will then enqueueUpdate the outgoing response.
+     */
+    public void run() {
+        try {
+            RequestPath path = new RequestPath(getPath(), getLink());
+            if (path.isResponder()) {
+                DSIResponder responder = (DSIResponder) path.getTarget();
+                setPath(path.getPath());
+                result = responder.onInvoke(this);
+            }
+            DSInfo info = path.getInfo();
+            if (!info.isAction()) {
+                throw new DSRequestException("Not an action " + path.getPath());
+            }
+            if (info.isAdmin()) {
+                if (!permission.isConfig()) {
+                    throw new DSPermissionException("Config permission required");
+                }
+            } else if (!info.isReadOnly()) {
+                if (DSPermission.WRITE.isGreaterThan(permission)) {
+                    throw new DSPermissionException("Write permission required");
+                }
+            } else {
+                if (DSPermission.READ.isGreaterThan(permission)) {
+                    throw new DSPermissionException("Read permission required");
+                }
+            }
+            DSAction action = info.getAction();
+            result = action.invoke(info, this);
+        } catch (Exception x) {
+            error(getPath(), x);
+            close(x);
+            return;
+        }
+        if (result == null) {
+            close();
+        } else {
+            enqueueResponse();
+        }
+    }
+
     @Override
     public void send(DSList row) {
         enqueueUpdate(new Update(row));
     }
 
+    /**
+     * For v2 only, set to false to auto close the stream after sending the initial state.
+     */
+    public DSInboundInvoke setStream(boolean stream) {
+        this.stream = stream;
+        return this;
+    }
+
     @Override
-    public void write(DSIWriter out) {
+    public void write(MessageWriter writer) {
         enqueued = false;
         if (isClosed()) {
             return;
         }
         if (isClosePending() && (updateHead == null) && (closeReason != null)) {
-            ErrorResponse res = new ErrorResponse(closeReason);
-            res.parseRequest(getRequest());
-            res.write(out);
+            getResponder().sendError(this, closeReason);
             doClose();
             return;
         }
-        out.beginMap();
-        out.key("rid").value(getRequestId());
+        writeBegin(writer);
         switch (state) {
             case STATE_INIT:
-                writeColumns(out);
-                writeInitialResults(out);
+                writeColumns(writer);
+                writeInitialResults(writer);
                 break;
             case STATE_ROWS:
-                writeInitialResults(out);
+                writeInitialResults(writer);
                 break;
             case STATE_CLOSE_PENDING:
             case STATE_UPDATES:
-                writeUpdates(out);
+                writeUpdates(writer);
                 break;
-            default:
-                ;
         }
         if (isClosePending() && (updateHead == null)) {
             if (closeReason != null) {
-                ErrorResponse res = new ErrorResponse(closeReason);
-                res.parseRequest(getRequest());
-                getResponder().sendResponse(res);
+                getResponder().sendError(this, closeReason);
             } else {
-                out.key("stream").value("closed");
+                writeClose(writer);
             }
             doClose();
         }
-        out.endMap();
+        writeEnd(writer);
+    }
+
+    /**
+     * Override point for v2, handles v1.
+     */
+    protected void writeBegin(MessageWriter writer) {
+        writer.getWriter().beginMap().key("rid").value(getRequestId());
     }
 
-    private void writeColumns(DSIWriter out) {
+    /**
+     * Override point for v2, handles v1.
+     */
+    protected void writeClose(MessageWriter writer) {
+        writer.getWriter().key("stream").value("closed");
+    }
+
+    /**
+     * Override point for v2, handles v1.
+     */
+    protected void writeEnd(MessageWriter writer) {
+        writer.getWriter().endMap();
+    }
+
+    private void writeColumns(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         if (result instanceof ActionValues) {
             out.key("columns").beginList();
             Iterator<DSMap> it = result.getAction().getValueResults();
@@ -304,9 +365,10 @@ private void writeColumns(DSIWriter out) {
         }
     }
 
-    private void writeInitialResults(DSIWriter out) {
+    private void writeInitialResults(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         state = STATE_ROWS;
-        out.key("updates").beginList();
+        out.key(getRowsName()).beginList();
         if (result instanceof ActionValues) {
             out.beginList();
             Iterator<DSIValue> values = ((ActionValues) result).getValues();
@@ -321,7 +383,7 @@ private void writeInitialResults(DSIWriter out) {
             if (rows == null) {
                 rows = ((ActionTable) result).getRows();
             }
-            DS1Responder session = getResponder();
+            DSResponder session = getResponder();
             while (rows.hasNext()) {
                 out.value(rows.next());
                 if (session.shouldEndMessage()) {
@@ -332,17 +394,25 @@ private void writeInitialResults(DSIWriter out) {
             }
         }
         out.endList();
-        if ((result == null) || !result.getAction().getResultType().isOpen()) {
-            out.key("stream").value("closed");
+        if ((result == null) || !result.getAction().getResultType().isOpen() || !stream) {
+            writeClose(writer);
             state = STATE_CLOSED;
             doClose();
         } else {
-            out.key("stream").value("open");
+            writeOpen(writer);
             state = STATE_UPDATES;
         }
     }
 
-    private void writeUpdates(DSIWriter out) {
+    /**
+     * Override point for v2, handles v1.
+     */
+    protected void writeOpen(MessageWriter writer) {
+        writer.getWriter().key("stream").value("open");
+    }
+
+    private void writeUpdates(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
         Update update = updateHead; //peak ahead
         if (update == null) {
             return;
@@ -354,8 +424,8 @@ private void writeUpdates(DSIWriter out) {
                .key("meta").beginMap().endMap()
                .endMap();
         }
-        out.key("updates").beginList();
-        DS1Responder session = getResponder();
+        out.key(getRowsName()).beginList();
+        DSResponder responder = getResponder();
         while (true) {
             update = dequeueUpdate();
             if (update.rows != null) {
@@ -368,7 +438,7 @@ private void writeUpdates(DSIWriter out) {
             if ((updateHead == null) || (updateHead.type != null)) {
                 break;
             }
-            if (session.shouldEndMessage()) {
+            if (responder.shouldEndMessage()) {
                 enqueueResponse();
                 break;
             }
@@ -383,7 +453,7 @@ private void writeUpdates(DSIWriter out) {
     /**
      * Used to described more complex updates.
      */
-    private enum UpdateType {
+    protected enum UpdateType {
         INSERT("insert"),
         REFRESH("refresh"),
         REPLACE("replace");
@@ -402,7 +472,7 @@ public String toString() {
     /**
      * Describes an update to be sent to the requester.
      */
-    private static class Update {
+    protected static class Update {
 
         int beginIndex = -1;
         int endIndex = -1;
@@ -448,8 +518,4 @@ String typeValue() {
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java
new file mode 100644
index 00000000..1778b567
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundList.java
@@ -0,0 +1,738 @@
+package com.acuity.iot.dsa.dslink.protocol.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.DSStream;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.protocol.message.RequestPath;
+import java.util.Iterator;
+import org.iot.dsa.DSRuntime;
+import org.iot.dsa.dslink.DSIResponder;
+import org.iot.dsa.dslink.responder.ApiObject;
+import org.iot.dsa.dslink.responder.InboundListRequest;
+import org.iot.dsa.dslink.responder.OutboundListResponse;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSIEnum;
+import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSList;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSMap.Entry;
+import org.iot.dsa.node.DSMetadata;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSPath;
+import org.iot.dsa.node.DSValueType;
+import org.iot.dsa.node.action.ActionSpec;
+import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.event.DSIEvent;
+import org.iot.dsa.node.event.DSISubscriber;
+import org.iot.dsa.node.event.DSInfoTopic;
+import org.iot.dsa.node.event.DSTopic;
+import org.iot.dsa.security.DSPermission;
+
+/**
+ * List implementation for a responder.
+ *
+ * @author Aaron Hansen
+ */
+public class DSInboundList extends DSInboundRequest
+        implements DSISubscriber, DSStream, InboundListRequest, OutboundMessage,
+        OutboundListResponse, Runnable {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final int STATE_INIT = 0;
+    private static final int STATE_CHILDREN = 1;
+    private static final int STATE_UPDATES = 2;
+    private static final int STATE_CLOSE_PENDING = 3;
+    private static final int STATE_CLOSED = 4;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private StringBuilder cacheBuf = new StringBuilder();
+    private DSMap cacheMap = new DSMap();
+    private DSMetadata cacheMeta = new DSMetadata(cacheMap);
+    private Iterator<ApiObject> children;
+    private Exception closeReason;
+    private DSInfo info;
+    private DSNode node;
+    private OutboundListResponse response;
+    private boolean enqueued = false;
+    private int state = STATE_INIT;
+    private boolean stream = true;
+    private Update updateHead;
+    private Update updateTail;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Override point for v2.
+     */
+    protected void beginMessage(MessageWriter writer) {
+        writer.getWriter().beginMap().key("rid").value(getRequestId());
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void beginUpdates(MessageWriter writer) {
+        writer.getWriter().key("updates").beginList();
+    }
+
+    @Override
+    public void childAdded(ApiObject child) {
+        if (!isClosed()) {
+            enqueue(new Update(child, true));
+        }
+    }
+
+    @Override
+    public void childRemoved(ApiObject child) {
+        if (!isClosed()) {
+            enqueue(new Update(child, false));
+        }
+    }
+
+    @Override
+    public void close() {
+        if (!isOpen()) {
+            return;
+        }
+        state = STATE_CLOSE_PENDING;
+        enqueueResponse();
+        fine(fine() ? getPath() + " list closed locally" : null);
+    }
+
+    @Override
+    public void close(Exception reason) {
+        if (!isOpen()) {
+            return;
+        }
+        state = STATE_CLOSE_PENDING;
+        closeReason = reason;
+        enqueueResponse();
+        fine(fine() ? getPath() + " list closed locally" : null);
+    }
+
+    /**
+     * Remove an update from the queue.
+     */
+    private synchronized Update dequeue() {
+        if (updateHead == null) {
+            return null;
+        }
+        Update ret = updateHead;
+        if (updateHead == updateTail) {
+            updateHead = null;
+            updateTail = null;
+        } else {
+            updateHead = updateHead.next;
+        }
+        ret.next = null;
+        return ret;
+    }
+
+    private void doClose() {
+        state = STATE_CLOSED;
+        getResponder().removeRequest(getRequestId());
+        if (response == null) {
+            return;
+        }
+        DSRuntime.run(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    response.onClose();
+                } catch (Exception x) {
+                    error(getPath(), x);
+                }
+            }
+        });
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void encode(String key, DSElement value, MessageWriter writer) {
+        writer.getWriter().beginList().value(key).value(value).endList();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void encode(String key, String value, MessageWriter writer) {
+        writer.getWriter().beginList().value(key).value(value).endList();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void endMessage(MessageWriter writer, Boolean streamOpen) {
+        if (streamOpen != null) {
+            writer.getWriter().key("stream").value(streamOpen ? "open" : "closed");
+        }
+        writer.getWriter().endMap();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void endUpdates(MessageWriter writer) {
+        writer.getWriter().endList();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected String encodeName(String name, StringBuilder buf) {
+        buf.setLength(0);
+        if (DSPath.encodeNameV1(name, buf)) {
+            return buf.toString();
+        }
+        return name;
+    }
+
+    protected void encodeChild(ApiObject child, MessageWriter writer) {
+        String name = child.getName();
+        String safe = encodeName(name, cacheBuf);
+        DSMap map = new DSMap();
+        child.getMetadata(cacheMap.clear());
+        DSElement e = cacheMap.remove(DSMetadata.DISPLAY_NAME);
+        if (e != null) {
+            map.put("$name", e);
+        } else if (!safe.equals(name)) {
+            map.put("$name", name);
+        }
+        e = cacheMap.remove("$is");
+        if (e != null) {
+            map.put("$is", e);
+        } else {
+            map.put("$is", "node");
+        }
+        if (child.isAction()) {
+            ActionSpec action = child.getAction();
+            e = cacheMap.remove("$invokable");
+            if (e != null) {
+                map.put("$invokable", e);
+            } else {
+                if (child.isAdmin()) {
+                    map.put("$invokable", DSPermission.CONFIG.toString());
+                } else if (!child.isReadOnly()) {
+                    map.put("$invokable", DSPermission.WRITE.toString());
+                }
+            }
+        } else if (child.isValue()) {
+            e = cacheMap.remove("$type");
+            if (e != null) {
+                map.put("$type", e);
+            } else {
+                map.put("$type", encodeType(child.getValue(), cacheMeta));
+            }
+            if (!child.isReadOnly()) {
+                e = cacheMap.remove("$writable");
+                if (e != null) {
+                    map.put("$writable", e);
+                } else {
+                    map.put("$writable", child.isAdmin() ? "config" : "write");
+                }
+            }
+        } else if (child.isAdmin()) {
+            e = cacheMap.remove("$permission");
+            if (e != null) {
+                map.put("$permission", e);
+            } else {
+                map.put("$permission", "config");
+            }
+        }
+        encode(safe, map, writer);
+        cacheMap.clear();
+    }
+
+    /**
+     * Encode all the meta data about the root target of a list request.
+     */
+    private void encodeTarget(ApiObject object, MessageWriter writer) {
+        if (object instanceof DSInfo) {
+            DSMetadata.getMetadata((DSInfo) object, cacheMap.clear());
+        } else {
+            object.getMetadata(cacheMap.clear());
+        }
+        DSElement e = cacheMap.remove("$is");
+        if (e == null) {
+            encode("$is", "node", writer);
+        } else {
+            encode("$is", e, writer);
+
+        }
+        e = cacheMap.get("$name");
+        if (e == null) {
+            encode("$name", object.getName(), writer);
+        } else {
+            encode("$name", e, writer);
+        }
+        if (object.isAction()) {
+            encodeTargetAction(object, writer);
+        } else if (object.isValue()) {
+            encodeTargetValue(object, writer);
+        } else if (object.isAdmin()) {
+            e = cacheMap.remove("$permission");
+            if (e == null) {
+                encode("$permission", "config", writer);
+            } else {
+                encode("$permission", e, writer);
+            }
+        }
+        encodeTargetMetadata(cacheMap, writer);
+        cacheMap.clear();
+    }
+
+    /**
+     * Called by encodeTarget for actions.
+     */
+    private void encodeTargetAction(ApiObject object, MessageWriter writer) {
+        DSInfo info = null;
+        if (object instanceof DSInfo) {
+            info = (DSInfo) object;
+        }
+        ActionSpec action = object.getAction();
+        DSAction dsAction = null;
+        if (action instanceof DSAction) {
+            dsAction = (DSAction) action;
+        }
+        DSElement e = cacheMap.remove("$invokable");
+        if (e == null) {
+            if (object.isAdmin()) {
+                encode("$invokable", DSPermission.CONFIG.toString(), writer);
+            } else if (!object.isReadOnly()) {
+                encode("$invokable", DSPermission.WRITE.toString(), writer);
+            }
+        } else {
+            encode("$invokable", e, writer);
+        }
+        e = cacheMap.remove("params");
+        if (e == null) {
+            DSList list = new DSList();
+            Iterator<DSMap> params = action.getParameters();
+            if (params != null) {
+                DSMap param;
+                while (params.hasNext()) {
+                    param = params.next();
+                    fixRangeTypes(param);
+                    if (dsAction != null) {
+                        dsAction.prepareParameter(info, param);
+                    }
+                    if (param.hasParent()) {
+                        param = param.copy();
+                    }
+                    list.add(param);
+                }
+            }
+            encode("$params", list, writer);
+        } else {
+            encode("$params", e, writer);
+        }
+        if (action.getResultType().isValues()) {
+            e = cacheMap.remove("$columns");
+            if (e == null) {
+                DSList list = new DSList();
+                Iterator<DSMap> cols = action.getValueResults();
+                if (cols != null) {
+                    DSMap param;
+                    while (cols.hasNext()) {
+                        param = cols.next();
+                        fixRangeTypes(param);
+                        if (dsAction != null) {
+                            dsAction.prepareParameter(info, param);
+                        }
+                        if (param.hasParent()) {
+                            param = param.copy();
+                        }
+                        list.add(param);
+                    }
+                }
+                encode("$columns", list, writer);
+            } else {
+                encode("$columns", e, writer);
+            }
+        }
+        e = cacheMap.remove("$result");
+        if (e != null) {
+            encode("$result", e, writer);
+        } else if (!action.getResultType().isVoid()) {
+            encode("$result", action.getResultType().toString(), writer);
+        }
+    }
+
+    /**
+     * Called by encodeTarget, encodes meta-data as configs.
+     */
+    private void encodeTargetMetadata(DSMap metadata, MessageWriter writer) {
+        Entry entry;
+        String name;
+        for (int i = 0, len = metadata.size(); i < len; i++) {
+            entry = metadata.getEntry(i);
+            name = entry.getKey();
+            switch (name.charAt(0)) {
+                case '$':
+                case '@':
+                    break;
+                default:
+                    cacheBuf.append(encodeName(name, cacheBuf));
+                    cacheBuf.insert(0, '$');
+                    name = cacheBuf.toString();
+
+            }
+            encode(name, entry.getValue(), writer);
+        }
+    }
+
+    /**
+     * Called by encodeTarget for values.
+     */
+    private void encodeTargetValue(ApiObject object, MessageWriter writer) {
+        DSElement e = cacheMap.remove("$type");
+        if (e != null) {
+            encode("$type", e, writer);
+        } else {
+            encode("$type", encodeType(object.getValue(), cacheMeta), writer);
+        }
+        e = cacheMap.remove("$writable");
+        if (e != null) {
+            encode("$writable", e, writer);
+        } else if (!object.isReadOnly()) {
+            encode("$writable", object.isAdmin() ? "config" : "write", writer);
+        }
+    }
+
+    private DSElement encodeType(DSIValue value, DSMetadata meta) {
+        String type = meta.getType();
+        if (getResponder().isV1()) {
+            if ((type == null) && (value != null)) {
+                meta.setType(value);
+            }
+        } else {
+            if ((type == null) && (value != null)) {
+                if (value instanceof DSIEnum) {
+                    meta.getMap().put(DSMetadata.TYPE, DSValueType.STRING.toString());
+                } else {
+                    meta.setType(value);
+                }
+            }
+        }
+        fixRangeTypes(meta.getMap());
+        DSElement e = cacheMap.remove(DSMetadata.TYPE);
+        if (e == null) {
+            throw new IllegalArgumentException("Missing type");
+        }
+        return e;
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void encodeUpdate(Update update, MessageWriter writer, StringBuilder buf) {
+        if (update.added) {
+            encodeChild(update.child, writer);
+        } else {
+            writer.getWriter().beginMap()
+                  .key("name").value(encodeName(update.child.getName(), buf))
+                  .key("change").value("remove")
+                  .endMap();
+        }
+    }
+
+    private void enqueue(Update update) {
+        if (!isOpen()) {
+            return;
+        }
+        synchronized (this) {
+            if (updateHead == null) {
+                updateHead = update;
+                updateTail = update;
+            } else {
+                updateTail.next = update;
+                updateTail = update;
+            }
+            if (enqueued) {
+                return;
+            }
+        }
+        getResponder().sendResponse(this);
+    }
+
+    /**
+     * Enqueues in the session.
+     */
+    private void enqueueResponse() {
+        synchronized (this) {
+            if (enqueued) {
+                return;
+            }
+            enqueued = true;
+        }
+        getResponder().sendResponse(this);
+    }
+
+    /**
+     * Properly formats boolean and enum ranges for v1 and v2.
+     */
+    private void fixRangeTypes(DSMap arg) {
+        String type = arg.getString(DSMetadata.TYPE);
+        if ("bool".equals(type)) {
+            DSList range = (DSList) arg.remove(DSMetadata.BOOLEAN_RANGE);
+            if ((range == null) || (range.size() != 2)) {
+                return;
+            } else {
+                cacheBuf.setLength(0);
+                cacheBuf.append(type);
+                cacheBuf.append('[');
+                cacheBuf.append(range.get(0).toString());
+                cacheBuf.append(',');
+                cacheBuf.append(range.get(1).toString());
+                cacheBuf.append(']');
+                if (getResponder().isV1()) {
+                    arg.put(DSMetadata.TYPE, cacheBuf.toString());
+                } else {
+                    arg.put(DSMetadata.EDITOR, cacheBuf.toString());
+                }
+            }
+        } else if ("enum".equals(type) || "string".equals(type)) {
+            DSList range = (DSList) arg.remove(DSMetadata.ENUM_RANGE);
+            if (range == null) {
+                return;
+            }
+            cacheBuf.setLength(0);
+            cacheBuf.append("enum");
+            cacheBuf.append('[');
+            for (int i = 0, len = range.size(); i < len; i++) {
+                if (i > 0) {
+                    cacheBuf.append(',');
+                }
+                cacheBuf.append(range.get(i).toString());
+            }
+            cacheBuf.append(']');
+            if (getResponder().isV1()) {
+                arg.put(DSMetadata.TYPE, cacheBuf.toString());
+            } else {
+                arg.put(DSMetadata.EDITOR, cacheBuf.toString());
+            }
+        }
+    }
+
+    @Override
+    public ApiObject getTarget() {
+        return info;
+    }
+
+    private boolean isClosed() {
+        return state == STATE_CLOSED;
+    }
+
+    private boolean isClosePending() {
+        return state == STATE_CLOSE_PENDING;
+    }
+
+    /**
+     * Not closed or closed pending.
+     */
+    @Override
+    public boolean isOpen() {
+        return (state != STATE_CLOSE_PENDING) && (state != STATE_CLOSED);
+    }
+
+    @Override
+    public void onClose() {
+        if (node != null) {
+            node.unsubscribe(DSNode.INFO_TOPIC, null, this);
+        }
+    }
+
+    @Override
+    public void onEvent(DSTopic topic, DSIEvent event, DSNode node, DSInfo child,
+                        Object... params) {
+        switch ((DSInfoTopic.Event) event) {
+            case CHILD_ADDED:
+                childAdded(child);
+                break;
+            case CHILD_REMOVED:
+                childRemoved(child);
+                break;
+            case METADATA_CHANGED: //TODO
+                break;
+            default:
+        }
+    }
+
+    @Override
+    public void onUnsubscribed(DSTopic topic, DSNode node, DSInfo child) {
+        close();
+    }
+
+    @Override
+    public void onClose(Integer requestId) {
+        if (isClosed()) {
+            return;
+        }
+        state = STATE_CLOSED;
+        fine(debug() ? getPath() + " list closed" : null);
+        synchronized (this) {
+            updateHead = updateTail = null;
+        }
+        doClose();
+    }
+
+    @Override
+    public void run() {
+        try {
+            RequestPath path = new RequestPath(getPath(), getLink());
+            if (path.isResponder()) {
+                DSIResponder responder = (DSIResponder) path.getTarget();
+                setPath(path.getPath());
+                response = responder.onList(this);
+            } else {
+                info = path.getInfo();
+                if (info.isNode()) {
+                    node = info.getNode();
+                    node.subscribe(DSNode.INFO_TOPIC, null, this);
+                }
+                response = this;
+            }
+        } catch (Exception x) {
+            error(getPath(), x);
+            close(x);
+            return;
+        }
+        if (response == null) {
+            close();
+        } else {
+            enqueueResponse();
+        }
+    }
+
+    /**
+     * V2 only, set to false to auto close after sending the initial state.
+     */
+    public DSInboundList setStream(boolean stream) {
+        this.stream = stream;
+        return this;
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        enqueued = false;
+        if (isClosed()) {
+            return;
+        }
+        if (isClosePending() && (updateHead == null) && (closeReason != null)) {
+            getResponder().sendError(this, closeReason);
+            doClose();
+            return;
+        }
+        int last = state;
+        beginMessage(writer);
+        switch (state) {
+            case STATE_INIT:
+                beginUpdates(writer);
+                writeInit(writer);
+                break;
+            case STATE_CHILDREN:
+                beginUpdates(writer);
+                writeChildren(writer);
+                break;
+            case STATE_CLOSE_PENDING:
+            case STATE_UPDATES:
+                beginUpdates(writer);
+                writeUpdates(writer);
+                break;
+        }
+        endUpdates(writer);
+        if (state != last) {
+            if (state == STATE_UPDATES) {
+                if (stream) {
+                    endMessage(writer, Boolean.TRUE);
+                } else {
+                    endMessage(writer, Boolean.FALSE);
+                    doClose();
+                }
+            }
+        } else if (isClosePending() && (updateHead == null)) {
+            if (closeReason != null) {
+                getResponder().sendError(this, closeReason);
+            } else {
+                endMessage(writer, Boolean.FALSE);
+            }
+            doClose();
+        } else {
+            endMessage(writer, null);
+        }
+    }
+
+    private void writeChildren(MessageWriter writer) {
+        if (children != null) {
+            ApiObject child;
+            while (children.hasNext()) {
+                child = children.next();
+                if (!child.isHidden()) {
+                    encodeChild(child, writer);
+                }
+                if (getResponder().shouldEndMessage()) {
+                    enqueueResponse();
+                    return;
+                }
+            }
+        }
+        children = null;
+        state = STATE_UPDATES;
+    }
+
+    private void writeInit(MessageWriter writer) {
+        ApiObject target = response.getTarget();
+        encodeTarget(target, writer);
+        if (target.hasChildren()) {
+            state = STATE_CHILDREN;
+            children = target.getChildren();
+            writeChildren(writer);
+        } else {
+            state = STATE_UPDATES;
+            writeUpdates(writer);
+        }
+    }
+
+    private void writeUpdates(MessageWriter writer) {
+        DSResponder responder = getResponder();
+        Update update;
+        while (isOpen()) {
+            update = dequeue();
+            if (update == null) {
+                break;
+            }
+            encodeUpdate(update, writer, cacheBuf);
+            if (responder.shouldEndMessage()) {
+                enqueueResponse();
+                break;
+            }
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Inner Classes
+    ///////////////////////////////////////////////////////////////////////////
+
+    protected static class Update {
+
+        public boolean added;
+        public ApiObject child;
+        public Update next;
+
+        Update(ApiObject child, boolean added) {
+            this.child = child;
+            this.added = added;
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundRequest.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundRequest.java
new file mode 100644
index 00000000..8afacb3a
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundRequest.java
@@ -0,0 +1,82 @@
+package com.acuity.iot.dsa.dslink.protocol.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.dslink.responder.InboundRequest;
+import org.iot.dsa.logging.DSLogger;
+
+/**
+ * Getters and setters common to most requests.
+ *
+ * @author Aaron Hansen
+ */
+public abstract class DSInboundRequest extends DSLogger implements InboundRequest {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSLink link;
+    private String path;
+    private Integer requestId;
+    private DSResponder responder;
+    private DSSession session;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DSLink getLink() {
+        if (link == null) {
+            link = responder.getLink();
+        }
+        return link;
+    }
+
+    @Override
+    protected String getLogName() {
+        return getClass().getSimpleName();
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public Integer getRequestId() {
+        return requestId;
+    }
+
+    public DSResponder getResponder() {
+        return responder;
+    }
+
+    public DSSession getSession() {
+        return session;
+    }
+
+    public DSInboundRequest setLink(DSLink link) {
+        this.link = link;
+        return this;
+    }
+
+    public DSInboundRequest setPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    public DSInboundRequest setResponder(DSResponder responder) {
+        this.responder = responder;
+        return this;
+    }
+
+    public DSInboundRequest setSession(DSSession session) {
+        this.session = session;
+        return this;
+    }
+
+    public DSInboundRequest setRequestId(Integer requestId) {
+        this.requestId = requestId;
+        return this;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSet.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSet.java
new file mode 100644
index 00000000..7f31e913
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSet.java
@@ -0,0 +1,86 @@
+package com.acuity.iot.dsa.dslink.protocol.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.RequestPath;
+import org.iot.dsa.dslink.DSIResponder;
+import org.iot.dsa.dslink.DSPermissionException;
+import org.iot.dsa.dslink.DSRequestException;
+import org.iot.dsa.dslink.responder.InboundSetRequest;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.security.DSPermission;
+
+public class DSInboundSet extends DSInboundRequest implements InboundSetRequest, Runnable {
+
+    private DSElement value;
+    private DSPermission permission;
+
+    public DSInboundSet(DSElement value, DSPermission permission) {
+        this.permission = permission;
+        this.value = value;
+    }
+
+    @Override
+    public DSPermission getPermission() {
+        return permission;
+    }
+
+    @Override
+    public DSElement getValue() {
+        return value;
+    }
+
+    @Override
+    public void run() {
+        try {
+            RequestPath path = new RequestPath(getPath(), getLink());
+            if (path.isResponder()) {
+                DSIResponder responder = (DSIResponder) path.getTarget();
+                setPath(path.getPath());
+                responder.onSet(this);
+            } else {
+                DSNode parent = path.getParent();
+                DSInfo info = path.getInfo();
+                if (info.isReadOnly()) {
+                    throw new DSRequestException("Not writable: " + getPath());
+                }
+                if (!permission.isConfig()) {
+                    if (info.isAdmin()) {
+                        throw new DSPermissionException("Config permission required");
+                    } else if (DSPermission.WRITE.isGreaterThan(permission)) {
+                        throw new DSPermissionException("Write permission required");
+                    }
+                }
+                if (info.isNode()) {
+                    info.getNode().onSet(value);
+                } else {
+                    DSIValue current = info.getValue();
+                    if (current == null) {
+                        if (info.getDefaultObject() instanceof DSIValue) {
+                            current = (DSIValue) info.getDefaultObject();
+                        }
+                    }
+                    if (current != null) {
+                        current = current.valueOf(value);
+                    } else {
+                        current = value;
+                    }
+                    parent.onSet(info, current);
+                }
+            }
+            sendClose();
+        } catch (Exception x) {
+            error(getPath(), x);
+            getResponder().sendError(this, x);
+        }
+    }
+
+    /**
+     * Override point for V2.
+     */
+    protected void sendClose() {
+        getResponder().sendClose(getRequestId());
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java
new file mode 100644
index 00000000..932e096c
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java
@@ -0,0 +1,292 @@
+package com.acuity.iot.dsa.dslink.protocol.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.RequestPath;
+import org.iot.dsa.dslink.DSIResponder;
+import org.iot.dsa.dslink.responder.InboundSubscribeRequest;
+import org.iot.dsa.dslink.responder.SubscriptionCloseHandler;
+import org.iot.dsa.io.DSIWriter;
+import org.iot.dsa.node.DSIStatus;
+import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.node.event.DSIEvent;
+import org.iot.dsa.node.event.DSISubscriber;
+import org.iot.dsa.node.event.DSTopic;
+import org.iot.dsa.node.event.DSValueTopic.Event;
+import org.iot.dsa.time.DSTime;
+
+/**
+ * Subscribe implementation for the responder.
+ *
+ * @author Aaron Hansen
+ */
+public class DSInboundSubscription extends DSInboundRequest
+        implements DSISubscriber, InboundSubscribeRequest {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSInfo child;
+    private boolean closeAfterUpdate = false;
+    private SubscriptionCloseHandler closeHandler;
+    private boolean enqueued = false;
+    private DSInboundSubscriptions manager;
+    private DSNode node;
+    private boolean open = true;
+    private Integer sid;
+    private int qos = 0;
+    private Update updateHead;
+    private Update updateTail;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    protected DSInboundSubscription(DSInboundSubscriptions manager, Integer sid, String path,
+                                    int qos) {
+        this.manager = manager;
+        this.sid = sid;
+        setPath(path);
+        this.qos = qos;
+        setLink(manager.getLink());
+        init();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void close() {
+        manager.unsubscribe(sid);
+    }
+
+    /**
+     * Remove an update from the queue.
+     */
+    protected synchronized Update dequeue() {
+        if (updateHead == null) {
+            return null;
+        }
+        Update ret = null;
+        ret = updateHead;
+        if (updateHead == updateTail) {
+            updateHead = updateTail = null;
+        } else {
+            updateHead = updateHead.next;
+        }
+        ret.next = null;
+        return ret;
+    }
+
+    /**
+     * Unique subscription id for this path.
+     */
+    @Override
+    public Integer getSubscriptionId() {
+        return sid;
+    }
+
+    protected void init() {
+        RequestPath path = new RequestPath(getPath(), getLink());
+        if (path.isResponder()) {
+            DSIResponder responder = (DSIResponder) path.getTarget();
+            setPath(path.getPath());
+            closeHandler = responder.onSubscribe(this);
+        } else {
+            DSInfo info = path.getInfo();
+            if (info.isNode()) {
+                node = info.getNode();
+                node.subscribe(DSNode.VALUE_TOPIC, null, this);
+                onEvent(DSNode.VALUE_TOPIC, Event.NODE_CHANGED, info.getNode(), null,
+                        (Object[]) null);
+            } else {
+                node = path.getParent();
+                child = info;
+                node.subscribe(DSNode.VALUE_TOPIC, info, this);
+                onEvent(DSNode.VALUE_TOPIC, Event.CHILD_CHANGED, node, info,
+                        (Object[]) null);
+            }
+        }
+    }
+
+    /**
+     * For v2 only.
+     */
+    public boolean isCloseAfterUpdate() {
+        return closeAfterUpdate;
+    }
+
+    /**
+     * Called no matter how closed.
+     */
+    void onClose() {
+        synchronized (this) {
+            if (!open) {
+                return;
+            }
+            open = false;
+        }
+        try {
+            if (closeHandler != null) {
+                closeHandler.onClose(getSubscriptionId());
+            }
+        } catch (Exception x) {
+            manager.warn(manager.getPath(), x);
+        }
+        try {
+            if (node != null) {
+                node.unsubscribe(DSNode.VALUE_TOPIC, child, this);
+            }
+        } catch (Exception x) {
+            manager.warn(manager.getPath(), x);
+        }
+    }
+
+    @Override
+    public void onEvent(DSTopic topic, DSIEvent event, DSNode node, DSInfo child,
+                        Object... params) {
+        DSIValue value;
+        if (child != null) {
+            value = child.getValue();
+        } else {
+            value = (DSIValue) node;
+        }
+        DSStatus quality = DSStatus.ok;
+        if (value instanceof DSIStatus) {
+            quality = ((DSIStatus) value).toStatus();
+        }
+        update(System.currentTimeMillis(), value, quality);
+    }
+
+    @Override
+    public void onUnsubscribed(DSTopic topic, DSNode node, DSInfo info) {
+        close();
+    }
+
+    /**
+     * The responder should call this whenever the value or status changes.
+     */
+    @Override
+    public void update(long timestamp, DSIValue value, DSStatus quality) {
+        if (!open) {
+            return;
+        }
+        trace(trace() ? "Update " + getPath() + " to " + value : null);
+        if (qos == 0) {
+            synchronized (this) {
+                if (updateHead == null) {
+                    updateHead = updateTail = new Update();
+                }
+                updateHead.set(timestamp, value, quality);
+                if (enqueued) {
+                    return;
+                }
+                enqueued = true;
+            }
+        } else {
+            Update update = new Update().set(timestamp, value, quality);
+            synchronized (this) {
+                if (updateHead == null) {
+                    updateHead = updateTail = update;
+                } else {
+                    updateTail.next = update;
+                }
+                if (enqueued) {
+                    return;
+                }
+                enqueued = true;
+            }
+        }
+        manager.enqueue(this);
+    }
+
+    public DSInboundSubscription setCloseAfterUpdate(boolean closeAfterUpdate) {
+        this.closeAfterUpdate = closeAfterUpdate;
+        return this;
+    }
+
+    protected DSInboundSubscription setQos(int qos) {
+        this.qos = qos;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "Subscription (" + getSubscriptionId() + ") " + getPath();
+    }
+
+
+    /**
+     * Encodes one or more updates.
+     *
+     * @param writer Where to encode.
+     * @param buf    For encoding timestamps.
+     */
+    protected void write(MessageWriter writer, StringBuilder buf) {
+        DSResponder session = getResponder();
+        Update update = dequeue();
+        while (update != null) {
+            write(update, writer, buf);
+            if ((qos == 0) || session.shouldEndMessage()) {
+                break;
+            }
+        }
+        synchronized (this) {
+            if (updateHead == null) {
+                if (qos == 0) {
+                    //reuse instance
+                    updateHead = updateTail = update;
+                }
+                enqueued = false;
+                return;
+            }
+        }
+        manager.enqueue(this);
+    }
+
+    /**
+     * Encode a single update.  This is implemented for v1 and will need to be overridden for
+     * v2.
+     *
+     * @param update The udpate to write.
+     * @param writer Where to write.
+     * @param buf    For encoding timestamps.
+     */
+    protected void write(Update update, MessageWriter writer, StringBuilder buf) {
+        DSIWriter out = writer.getWriter();
+        out.beginMap();
+        out.key("sid").value(getSubscriptionId());
+        buf.setLength(0);
+        DSTime.encode(update.timestamp, true, buf);
+        out.key("ts").value(buf.toString());
+        out.key("value").value(update.value.toElement());
+        if ((update.quality != null) && !update.quality.isOk()) {
+            out.key("quality").value(update.quality.toString());
+        }
+        out.endMap();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Inner Classes
+    ///////////////////////////////////////////////////////////////////////////
+
+    protected class Update {
+
+        Update next;
+        public long timestamp;
+        public DSIValue value;
+        public DSStatus quality;
+
+        Update set(long timestamp, DSIValue value, DSStatus quality) {
+            this.timestamp = timestamp;
+            this.value = value;
+            this.quality = quality;
+            return this;
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscriptions.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscriptions.java
new file mode 100644
index 00000000..a3b0967f
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscriptions.java
@@ -0,0 +1,177 @@
+package com.acuity.iot.dsa.dslink.protocol.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.node.DSNode;
+
+/**
+ * Subscribe implementation for the responder.
+ *
+ * @author Aaron Hansen
+ */
+public class DSInboundSubscriptions extends DSNode implements OutboundMessage {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final Integer ZERO = Integer.valueOf(0);
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private boolean enqueued = false;
+    private ConcurrentLinkedQueue<DSInboundSubscription> outbound =
+            new ConcurrentLinkedQueue<DSInboundSubscription>();
+    private Map<String, DSInboundSubscription> pathMap =
+            new ConcurrentHashMap<String, DSInboundSubscription>();
+    private DSResponder responder;
+    private Map<Integer, DSInboundSubscription> sidMap =
+            new ConcurrentHashMap<Integer, DSInboundSubscription>();
+    private StringBuilder timestampBuffer = new StringBuilder();
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DSInboundSubscriptions(DSResponder responder) {
+        this.responder = responder;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Add to the outbound queue if not already enqueued.
+     */
+    protected void enqueue(DSInboundSubscription subscription) {
+        synchronized (this) {
+            outbound.add(subscription);
+            if (enqueued) {
+                return;
+            }
+            enqueued = true;
+        }
+        responder.sendResponse(this);
+    }
+
+    DSLink getLink() {
+        return responder.getConnection().getLink();
+    }
+
+    public DSResponder getResponder() {
+        return responder;
+    }
+
+    /**
+     * Returns a DSInboundSubscription for v1.
+     *
+     * @param sid  Subscription ID.
+     * @param path Path being subscribed to.
+     * @param qos  Quality of service.
+     */
+    protected DSInboundSubscription makeSubscription(Integer sid, String path, int qos) {
+        return new DSInboundSubscription(this, sid, path, qos);
+    }
+
+    public void onConnect() {
+    }
+
+    public void onConnectFail() {
+    }
+
+    /**
+     * Unsubscribes all.
+     */
+    public void onDisconnect() {
+        for (Integer i : sidMap.keySet()) {
+            unsubscribe(i);
+        }
+    }
+
+    /**
+     * Create or update a subscription.
+     */
+    public DSInboundSubscription subscribe(Integer sid, String path, int qos) {
+        trace(trace() ? "Subscribing " + path : null);
+        DSInboundSubscription subscription = sidMap.get(sid);
+        if (subscription == null) {
+            subscription = makeSubscription(sid, path, qos);
+            sidMap.put(sid, subscription);
+            pathMap.put(path, subscription);
+        } else if (!path.equals(subscription.getPath())) {
+            unsubscribe(sid);
+            return subscribe(sid, path, qos);
+        } else {
+            subscription.setQos(qos);
+            //TODO refresh subscription, align w/v2
+        }
+        return subscription;
+    }
+
+    /**
+     * Remove the subscription and call onClose.
+     */
+    public void unsubscribe(Integer sid) {
+        DSInboundSubscription subscription = sidMap.remove(sid);
+        if (subscription != null) {
+            trace(trace() ? "Unsubscribing " + subscription.getPath() : null);
+            pathMap.remove(subscription.getPath());
+            try {
+                subscription.onClose();
+            } catch (Exception x) {
+                warn(warn() ? subscription.toString() : null, x);
+            }
+        }
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        writeBegin(writer);
+        DSInboundSubscription sub;
+        while (!responder.shouldEndMessage()) {
+            sub = outbound.poll();
+            if (sub == null) {
+                break;
+            }
+            sub.write(writer, timestampBuffer);
+            if (sub.isCloseAfterUpdate()) {
+                unsubscribe(sub.getSubscriptionId());
+            }
+        }
+        writeEnd(writer);
+        synchronized (this) {
+            if (outbound.isEmpty()) {
+                enqueued = false;
+                return;
+            }
+        }
+        responder.sendResponse(this);
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void writeBegin(MessageWriter writer) {
+        writer.getWriter()
+              .beginMap()
+              .key("rid").value(ZERO)
+              .key("updates").beginList();
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void writeEnd(MessageWriter writer) {
+        writer.getWriter()
+              .endList()
+              .endMap();
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSResponder.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSResponder.java
new file mode 100644
index 00000000..d2912a0c
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSResponder.java
@@ -0,0 +1,124 @@
+package com.acuity.iot.dsa.dslink.protocol.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.DSStream;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.dslink.DSLinkConnection;
+import org.iot.dsa.node.DSNode;
+
+/**
+ * Abstract responder implementation.
+ *
+ * @author Aaron Hansen
+ */
+public abstract class DSResponder extends DSNode {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSLinkConnection connection;
+    private ConcurrentHashMap<Integer, DSStream> inboundRequests = new ConcurrentHashMap<Integer, DSStream>();
+    private DSLink link;
+    private DSSession session;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - Constructors
+    /////////////////////////////////////////////////////////////////
+
+    public DSResponder(DSSession session) {
+        this.session = session;
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    public DSLinkConnection getConnection() {
+        if (connection == null) {
+            connection = session.getConnection();
+        }
+        return connection;
+    }
+
+    public DSLink getLink() {
+        if (link == null) {
+            link = getConnection().getLink();
+        }
+        return link;
+    }
+
+    @Override
+    protected String getLogName() {
+        return getClass().getSimpleName();
+    }
+
+    public Map<Integer, DSStream> getRequests() {
+        return inboundRequests;
+    }
+
+    public DSSession getSession() {
+        return session;
+    }
+
+    protected abstract DSInboundSubscriptions getSubscriptions();
+
+    public DSTransport getTransport() {
+        return getConnection().getTransport();
+    }
+
+    /**
+     * V2 override point, this returns true.
+     */
+    public boolean isV1() {
+        return true;
+    }
+
+    public void onConnect() {
+    }
+
+    public void onConnectFail() {
+    }
+
+    public void onDisconnect() {
+        Iterator<Entry<Integer, DSStream>> it = inboundRequests.entrySet().iterator();
+        Map.Entry<Integer, DSStream> me;
+        while (it.hasNext()) {
+            me = it.next();
+            try {
+                me.getValue().onClose(me.getKey());
+            } catch (Exception x) {
+                error(getPath(), x);
+            }
+            it.remove();
+        }
+        getSubscriptions().onDisconnect();
+    }
+
+    protected DSStream putRequest(Integer rid, DSStream request) {
+        return inboundRequests.put(rid, request);
+    }
+
+    public DSStream removeRequest(Integer rid) {
+        return inboundRequests.remove(rid);
+    }
+
+    public abstract void sendClose(int rid);
+
+    public abstract void sendError(DSInboundRequest req, Throwable reason);
+
+    public boolean shouldEndMessage() {
+        return session.shouldEndMessage();
+    }
+
+    public void sendResponse(OutboundMessage res) {
+        session.enqueueOutgoingResponse(res);
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/CloseMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/CloseMessage.java
new file mode 100644
index 00000000..b1c1eac2
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/CloseMessage.java
@@ -0,0 +1,38 @@
+package com.acuity.iot.dsa.dslink.protocol.v1;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import org.iot.dsa.io.DSIWriter;
+
+/**
+ * Responder uses to close streams without errors.
+ *
+ * @author Aaron Hansen
+ */
+public class CloseMessage implements OutboundMessage {
+
+    private boolean method = false;
+    private Integer rid;
+
+    public CloseMessage(Integer requestId) {
+        this.rid = requestId;
+    }
+
+    public CloseMessage(Integer requestId, boolean method) {
+        this.rid = requestId;
+        this.method = method;
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
+        out.beginMap().key("rid").value(rid);
+        if (method) {
+            out.key("method").value("close");
+        } else {
+            out.key("stream").value("closed");
+        }
+        out.endMap();
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1ConnectionInit.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java
similarity index 90%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1ConnectionInit.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java
index 8a446ec9..fe1b302f 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/DS1ConnectionInit.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java
@@ -1,4 +1,4 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1;
+package com.acuity.iot.dsa.dslink.protocol.v1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -6,7 +6,6 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.MessageDigest;
-import java.util.logging.Logger;
 import org.iot.dsa.dslink.DSLink;
 import org.iot.dsa.dslink.DSLinkConfig;
 import org.iot.dsa.io.DSBase64;
@@ -44,7 +43,6 @@ public class DS1ConnectionInit extends DSNode {
     private String brokerUri;
     private DS1LinkConnection connection;
     private DSLink link;
-    private Logger logger;
     private DSMap response;
 
     ///////////////////////////////////////////////////////////////////////////
@@ -59,17 +57,6 @@ DSLink getLink() {
         return connection.getLink();
     }
 
-    /**
-     * Uses the connection's logger.
-     */
-    @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = connection.getLogger();
-        }
-        return logger;
-    }
-
     /**
      * Returns the brokers response to connection initialization.
      */
@@ -85,7 +72,7 @@ DSMap getResponse() {
      */
     void initializeConnection() throws Exception {
         String uri = makeBrokerUrl();
-        config(config() ? "Broker URI " + uri : null);
+        fine(fine() ? "Broker URI " + uri : null);
         HttpURLConnection conn = (HttpURLConnection) new URL(uri).openConnection();
         conn.setDoInput(true);
         conn.setDoOutput(true);
@@ -106,7 +93,7 @@ void initializeConnection() throws Exception {
             in = new JsonReader(conn.getInputStream(), "UTF-8");
             response = in.getMap();
             put(BROKER_RES, response).setReadOnly(true);
-            finest(finest() ? response : null);
+            trace(trace() ? response : null);
         } finally {
             if (in != null) {
                 in.close();
@@ -178,7 +165,7 @@ String makeWsUrl(String wsPath) {
                 buf.append("&token=").append(authToken);
             }
             buf.append("&dsId=").append(getLink().getDsId());
-            buf.append("&format=").append("json");
+            buf.append("&format=").append(response.getString("format"));
         } catch (Exception x) {
             DSException.throwRuntime(x);
         }
@@ -245,8 +232,8 @@ void writeConnectionRequest(HttpURLConnection conn) throws Exception {
             out = new JsonWriter(conn.getOutputStream());
             DSMap map = new DSMap();
             map.put("publicKey", DSBase64.encodeUrl(link.getKeys().encodePublic()));
-            map.put("isRequester", link.getConfig().isRequester());
-            map.put("isResponder", link.getConfig().isResponder());
+            map.put("isRequester", link.getMain().isRequester());
+            map.put("isResponder", link.getMain().isResponder());
             map.put("linkData", new DSMap());
             map.put("version", DSA_VERSION);
             DSList list = map.putList("formats");
@@ -255,7 +242,7 @@ void writeConnectionRequest(HttpURLConnection conn) throws Exception {
             }
             map.put("enableWebSocketCompression", false);
             put(BROKER_REQ, map).setReadOnly(true);
-            finest(finest() ? map.toString() : null);
+            trace(trace() ? map.toString() : null);
             out.value(map);
         } finally {
             if (out != null) {
@@ -264,8 +251,4 @@ void writeConnectionRequest(HttpURLConnection conn) throws Exception {
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java
new file mode 100644
index 00000000..911b3baf
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1LinkConnection.java
@@ -0,0 +1,217 @@
+package com.acuity.iot.dsa.dslink.protocol.v1;
+
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackReader;
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTextTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import org.iot.dsa.dslink.DSIRequester;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.dslink.DSLinkConfig;
+import org.iot.dsa.dslink.DSLinkConnection;
+import org.iot.dsa.io.DSIReader;
+import org.iot.dsa.io.DSIWriter;
+import org.iot.dsa.io.json.JsonReader;
+import org.iot.dsa.io.json.JsonWriter;
+import org.iot.dsa.util.DSException;
+
+/**
+ * The DSA V1 connection implementation. Performs connection initialization with the broker, then
+ * creates a transport based on the broker response.
+ *
+ * @author Aaron Hansen
+ */
+public class DS1LinkConnection extends DSLinkConnection {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    static final String CONNECTION_INIT = "Initialization";
+    static final String SESSION = "Session";
+    static final String TRANSPORT = "Transport";
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DS1ConnectionInit connectionInit;
+    private DSLink link;
+    private DSIReader reader;
+    private DSTransport transport;
+    private DS1Session session;
+    private DSIWriter writer;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Forcefully closes an open connection.  Does not prevent reconnection, intended for
+     * problem resolution.
+     */
+    public void disconnect() {
+        if (session != null) {
+            session.disconnect();
+        }
+    }
+
+    public DSIReader getReader() {
+        return reader;
+    }
+
+    @Override
+    public DSIRequester getRequester() {
+        return session.getRequester();
+    }
+
+    @Override
+    public DS1Session getSession() {
+        return session;
+    }
+
+    @Override
+    public DSTransport getTransport() {
+        return transport;
+    }
+
+    public DSIWriter getWriter() {
+        return writer;
+    }
+
+    protected DS1ConnectionInit initializeConnection() {
+        DS1ConnectionInit init = new DS1ConnectionInit();
+        put(CONNECTION_INIT, init).setTransient(true);
+        try {
+            init.initializeConnection();
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        return init;
+    }
+
+    /**
+     * Looks at the connection initialization response to determine the type of transport then
+     * instantiates the correct type fom the config.
+     */
+    protected DSTransport makeTransport(DS1ConnectionInit init) {
+        DSTransport.Factory factory = null;
+        String wsUri = init.getResponse().get("wsUri", null);
+        if (wsUri == null) {
+            throw new IllegalStateException("Only websocket transports are supported.");
+        }
+        DSTransport transport = null;
+        try {
+            String type = link.getConfig().getConfig(
+                    DSLinkConfig.CFG_WS_TRANSPORT_FACTORY,
+                    "org.iot.dsa.dslink.websocket.StandaloneTransportFactory");
+            factory = (DSTransport.Factory) Class.forName(type).newInstance();
+            String format = init.getResponse().getString("format");
+            if ("msgpack".equals(format)) {
+                transport = factory.makeBinaryTransport(this);
+            } else if ("json".equals(format)) {
+                transport = factory.makeTextTransport(this);
+            } else {
+                throw new IllegalStateException("Unknown format: " + format);
+            }
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        String uri = init.makeWsUrl(wsUri);
+        fine(fine() ? "Connection URL = " + uri : null);
+        transport.setConnectionUrl(uri);
+        transport.setConnection(this);
+        transport.setReadTimeout(getLink().getConfig().getConfig(
+                DSLinkConfig.CFG_READ_TIMEOUT, 60000));
+        setTransport(transport);
+        fine(fine() ? "Transport type: " + transport.getClass().getName() : null);
+        return transport;
+    }
+
+    @Override
+    protected void onConnect() {
+        try {
+            DS1ConnectionInit init = connectionInit;
+            //Don't reuse the connection init if there is connection problem.
+            connectionInit = null;
+            getTransport().open();
+            session.onConnect();
+            connectionInit = init;
+        } catch (Exception x) {
+            session.onConnectFail();
+            DSException.throwRuntime(x);
+        }
+    }
+
+    @Override
+    protected void onDisconnect() {
+        if (session != null) {
+            session.onDisconnect();
+        }
+        reader = null;
+        writer = null;
+        transport = null;
+        remove(TRANSPORT);
+    }
+
+    @Override
+    protected void onInitialize() {
+        DS1ConnectionInit init = connectionInit;
+        //Don't reuse the connection init if there is connection problem.
+        connectionInit = null;
+        if (init == null) {
+            init = initializeConnection();
+        }
+        makeTransport(init);
+        put(TRANSPORT, getTransport()).setTransient(true);
+        if (session == null) {
+            session = new DS1Session(this);
+            put(SESSION, session).setTransient(true);
+        }
+        connectionInit = init;
+    }
+
+    @Override
+    protected void onRun() {
+        session.run();
+    }
+
+    @Override
+    protected void onStable() {
+        this.link = getLink();
+        super.onStable();
+    }
+
+    public void setRequesterAllowed() {
+        session.setRequesterAllowed();
+    }
+
+    /**
+     * Sets the transport and creates the appropriate reader/writer.
+     */
+    protected void setTransport(DSTransport transport) {
+        if (transport instanceof DSBinaryTransport) {
+            final DSBinaryTransport trans = (DSBinaryTransport) transport;
+            reader = new MsgpackReader(trans.getInput());
+            writer = new MsgpackWriter() {
+                @Override
+                public void onComplete() {
+                    writeTo(trans);
+                }
+            };
+        } else if (transport instanceof DSTextTransport) {
+            DSTextTransport trans = (DSTextTransport) transport;
+            reader = new JsonReader(trans.getReader());
+            writer = new JsonWriter(trans.getWriter());
+        } else {
+            throw new IllegalStateException(
+                    "Unexpected transport type: " + transport.getClass().getName());
+        }
+        this.transport = transport;
+    }
+
+    public void updateSalt(String salt) {
+        connectionInit.updateSalt(salt);
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1Session.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1Session.java
new file mode 100644
index 00000000..d2ad81ce
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1Session.java
@@ -0,0 +1,426 @@
+package com.acuity.iot.dsa.dslink.protocol.v1;
+
+import static org.iot.dsa.io.DSIReader.Token.BEGIN_LIST;
+import static org.iot.dsa.io.DSIReader.Token.BEGIN_MAP;
+import static org.iot.dsa.io.DSIReader.Token.END_LIST;
+import static org.iot.dsa.io.DSIReader.Token.END_MAP;
+import static org.iot.dsa.io.DSIReader.Token.NULL;
+
+import com.acuity.iot.dsa.dslink.protocol.DSProtocolException;
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.protocol.v1.requester.DS1Requester;
+import com.acuity.iot.dsa.dslink.protocol.v1.responder.DS1Responder;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.io.IOException;
+import org.iot.dsa.dslink.DSIRequester;
+import org.iot.dsa.io.DSIReader;
+import org.iot.dsa.io.DSIReader.Token;
+import org.iot.dsa.io.DSIWriter;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSInt;
+import org.iot.dsa.node.DSMap;
+
+/**
+ * Implements DSA 1.1.2
+ *
+ * @author Aaron Hansen
+ */
+public class DS1Session extends DSSession {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    static final int END_MSG_THRESHOLD = 48000;
+    static final String LAST_ACK_RECV = "Last Ack Recv";
+    static final String LAST_ACK_SENT = "Last Ack Sent";
+
+    static final int MAX_MSG_IVL = 45000;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSInfo lastAckRecv = getInfo(LAST_ACK_RECV);
+    private DSInfo lastAckSent = getInfo(LAST_ACK_SENT);
+    private long lastMessageSent;
+    private MessageWriter messageWriter;
+    private boolean requestsNext = false;
+    private DS1Requester requester = new DS1Requester(this);
+    private DS1Responder responder = new DS1Responder(this);
+
+    /////////////////////////////////////////////////////////////////
+    // Constructors
+    /////////////////////////////////////////////////////////////////
+
+    public DS1Session() {
+    }
+
+    public DS1Session(DS1LinkConnection connection) {
+        super(connection);
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Methods
+    /////////////////////////////////////////////////////////////////
+
+    /**
+     * Prepare a new message.  After this is called, beginRequests and/beginResponses maybe called.
+     * When the message is complete, endMessage will be called.
+     *
+     * @see #beginRequests()
+     * @see #beginResponses()
+     * @see #endMessage()
+     */
+    protected void beginMessage() {
+        DSIWriter out = getWriter();
+        out.beginMap();
+        out.key("msg").value(getNextMessageId());
+        int nextAck = getNextAck();
+        if (nextAck > 0) {
+            out.key("ack").value(nextAck);
+            put(lastAckSent, DSInt.valueOf(nextAck));
+        }
+    }
+
+    /**
+     * Prepare for the response portion of the message.  This will be followed by one or more calls
+     * to writeResponse().  When there are no more responses, endResponses() will be called.
+     *
+     * @see #writeResponse(OutboundMessage)
+     * @see #endResponses()
+     */
+    protected void beginResponses() {
+        getWriter().key("responses").beginList();
+    }
+
+    /**
+     * Prepare for the request portion of the message.  This will be followed by one or more calls
+     * to writeRequest().  When there are no more responses, endRequests() will be called.
+     *
+     * @see #writeResponse(OutboundMessage)
+     * @see #endResponses()
+     */
+    protected void beginRequests() {
+        getWriter().key("requests").beginList();
+    }
+
+    @Override
+    protected void declareDefaults() {
+        declareDefault(LAST_ACK_RECV, DSInt.NULL).setReadOnly(true);
+        declareDefault(LAST_ACK_SENT, DSInt.NULL).setReadOnly(true);
+    }
+
+    @Override
+    protected void doRecvMessage() throws IOException {
+        DSIReader reader = getReader();
+        switch (reader.next()) {
+            case BEGIN_MAP:
+                processEnvelope(reader);
+                break;
+            case END_MAP:
+            case END_LIST:
+            case ROOT:
+                break;
+            case END_INPUT:
+                return;
+            default:
+                throw new IOException("Unexpected input: " + reader.last());
+        }
+    }
+
+    @Override
+    protected void doSendMessage() {
+        DSTransport transport = getTransport();
+        long endTime = System.currentTimeMillis() + 2000;
+        DSIWriter writer = getWriter();
+        writer.reset();
+        requestsNext = !requestsNext;
+        transport.beginSendMessage();
+        beginMessage();
+        if (this.hasSomethingToSend()) {
+            send(requestsNext, endTime);
+            if ((System.currentTimeMillis() < endTime) && !shouldEndMessage()) {
+                send(!requestsNext, endTime);
+            }
+        }
+        endMessage();
+        transport.endSendMessage();
+        lastMessageSent = System.currentTimeMillis();
+    }
+
+    /**
+     * Complete the message.
+     */
+    protected void endMessage() {
+        getWriter().endMap().flush();
+    }
+
+    /**
+     * Complete the outgoing responses part of the message.
+     *
+     * @see #beginResponses()
+     * @see #writeResponse(OutboundMessage)
+     */
+    protected void endResponses() {
+        getWriter().endList();
+    }
+
+    /**
+     * Complete the outgoing requests part of the message.
+     *
+     * @see #beginRequests()
+     * @see #writeRequest(OutboundMessage)
+     */
+    protected void endRequests() {
+        getWriter().endList();
+    }
+
+    @Override
+    public DS1LinkConnection getConnection() {
+        return (DS1LinkConnection) super.getConnection();
+    }
+
+    private MessageWriter getMessageWriter() {
+        if (messageWriter == null) {
+            messageWriter = new MyMessageWriter(getConnection().getWriter());
+        }
+        return messageWriter;
+    }
+
+    public DSIReader getReader() {
+        return getConnection().getReader();
+    }
+
+    @Override
+    public DSIRequester getRequester() {
+        return requester;
+    }
+
+    private DSIWriter getWriter() {
+        return getMessageWriter().getWriter();
+    }
+
+    private boolean hasPingToSend() {
+        return (System.currentTimeMillis() - lastMessageSent) > MAX_MSG_IVL;
+    }
+
+    /**
+     * Override point, returns true if there are any pending acks or outbound messages queued up.
+     */
+    protected boolean hasSomethingToSend() {
+        if (hasPingToSend()) {
+            return true;
+        }
+        return super.hasSomethingToSend();
+    }
+
+    /*
+    @Override
+    protected void onStable() {
+        put("Requester Session", requesterSession);
+        put("Responder Session", responderSession);
+    }
+    */
+
+    @Override
+    public void onConnect() {
+        super.onConnect();
+        requester.onConnect();
+        responder.onConnect();
+    }
+
+    @Override
+    public void onConnectFail() {
+        super.onConnectFail();
+        requester.onConnectFail();
+        responder.onConnectFail();
+    }
+
+    @Override
+    public void onDisconnect() {
+        super.onDisconnect();
+        requester.onDisconnect();
+        responder.onDisconnect();
+    }
+
+    /**
+     * Decomposes and processes a complete envelope which can contain multiple requests and
+     * responses.
+     *
+     * @param reader lastRun() will return BEGIN_MAP
+     */
+    protected void processEnvelope(DSIReader reader) {
+        if (!requesterAllowed) {
+            getConnection().setRequesterAllowed();
+        }
+        int msg = -1;
+        Token next;
+        switch (reader.next()) {
+            case END_MAP:
+                return;
+            case STRING:
+                break;
+            default:
+                throw new IllegalStateException("Poorly formatted request");
+        }
+        boolean sendAck = false;
+        do {
+            String key = reader.getString();
+            if (key.equals("requests")) {
+                sendAck = true;
+                processMessages(reader, true);
+            } else if (key.equals("responses")) {
+                sendAck = true;
+                processMessages(reader, false);
+            } else if (key.equals("msg")) {
+                reader.next();
+                msg = (int) reader.getLong();
+            } else if (key.equals("ack")) {
+                reader.next();
+                put(lastAckRecv, DSInt.valueOf((int) reader.getLong()));
+            } else if (key.equals("allowed")) {
+                if (reader.next() != Token.BOOLEAN) {
+                    throw new IllegalStateException("Allowed not a boolean");
+                }
+                if (reader.getBoolean()) {
+                    fine(fine() ? "Requester allowed" : null);
+                    getConnection().setRequesterAllowed();
+                }
+            } else if (key.equals("salt")) {
+                if (reader.next() != Token.STRING) {
+                    throw new IllegalStateException("Salt not a string");
+                }
+                fine(fine() ? "Next salt: " + reader.getString() : null);
+                getConnection().updateSalt(reader.getString());
+            }
+            next = reader.next();
+        } while (next != END_MAP);
+        if (sendAck && (msg >= 0)) {
+            setNextAck(msg);
+        }
+    }
+
+    /**
+     * Processes a list of requests or responses.
+     *
+     * @param areRequests True for requests, false for responses.
+     */
+    protected void processMessages(DSIReader reader, boolean areRequests) {
+        Token next = reader.next();
+        if (next == NULL) {
+            return;
+        }
+        if (next != BEGIN_LIST) {
+            throw new IllegalStateException("Requests should be a list");
+        }
+        DSMap req;
+        int rid;
+        while (reader.next() == BEGIN_MAP) {
+            req = reader.getMap();
+            rid = req.get("rid", -1);
+            if (rid < 0) {
+                trace(trace() ? "No request ID: " + req.toString() : null);
+                throw new DSProtocolException("Response missing rid");
+            }
+            if (areRequests) {
+                responder.handleRequest(rid, req);
+            } else {
+                requester.handleResponse(rid, req);
+            }
+
+        }
+        if (reader.last() != END_LIST) {
+            throw new IllegalStateException("Unexpected input: " + reader.last());
+        }
+    }
+
+    /**
+     * Send messages from one of the queues.
+     *
+     * @param requests Determines which queue to use; True for outgoing requests, false for
+     *                 responses.
+     * @param endTime  Stop after this time.
+     */
+    private void send(boolean requests, long endTime) {
+        if (requests) {
+            if (!hasOutgoingRequests()) {
+                return;
+            }
+            beginRequests();
+        } else {
+            if (!hasOutgoingResponses()) {
+                return;
+            }
+            beginResponses();
+        }
+        OutboundMessage msg = requests ? dequeueOutgoingRequest() : dequeueOutgoingResponse();
+        while ((msg != null) && (System.currentTimeMillis() < endTime)) {
+            if (requests) {
+                writeRequest(msg);
+            } else {
+                writeResponse(msg);
+            }
+            if (!shouldEndMessage()) {
+                msg = requests ? dequeueOutgoingRequest() : dequeueOutgoingResponse();
+            } else {
+                msg = null;
+            }
+        }
+        if (requests) {
+            endRequests();
+        } else {
+            endResponses();
+        }
+    }
+
+    /**
+     * Returns true if the current message size has crossed a message size threshold.
+     */
+    public boolean shouldEndMessage() {
+        return (getWriter().length() + getTransport().messageSize()) > END_MSG_THRESHOLD;
+    }
+
+    /**
+     * Write a request in the current message. Can be called multiple times after beginRequests() is
+     * called.  endRequests() will be called once the request part of the message is complete.
+     *
+     * @see #beginRequests()
+     * @see #endRequests()
+     */
+    public void writeRequest(OutboundMessage message) {
+        message.write(getMessageWriter());
+    }
+
+    /**
+     * Write a response in the current message. Can be called multiple times after beginResponses()
+     * is called.  endResponses() will be called once the response part of the message is complete.
+     *
+     * @see #beginResponses()
+     * @see #endResponses()
+     */
+    public void writeResponse(OutboundMessage message) {
+        message.write(getMessageWriter());
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Inner Classes
+    /////////////////////////////////////////////////////////////////
+
+    private class MyMessageWriter implements MessageWriter {
+
+        DSIWriter writer;
+
+        MyMessageWriter(DSIWriter writer) {
+            this.writer = writer;
+        }
+
+        @Override
+        public DSIWriter getWriter() {
+            return writer;
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/requester/DS1Requester.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/requester/DS1Requester.java
new file mode 100644
index 00000000..5272def5
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/requester/DS1Requester.java
@@ -0,0 +1,162 @@
+package com.acuity.iot.dsa.dslink.protocol.v1.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v1.CloseMessage;
+import com.acuity.iot.dsa.dslink.protocol.v1.DS1Session;
+import org.iot.dsa.dslink.requester.ErrorType;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSList;
+import org.iot.dsa.node.DSMap;
+
+/**
+ * DSA V1 requester implementation.
+ *
+ * @author Daniel Shapiro, Aaron Hansen
+ */
+public class DS1Requester extends DSRequester {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DS1Requester(DS1Session session) {
+        super(session);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    private void handleError(DSOutboundStub stub, DSElement details) {
+        try {
+            ErrorType type = ErrorType.internalError;
+            String msg;
+            if (details.isMap()) {
+                String detail = null;
+                DSMap map = details.toMap();
+                String tmp = map.getString("type");
+                if (tmp.equals("permissionDenied")) {
+                    type = ErrorType.permissionDenied;
+                } else if (tmp.equals("invalidRequest")) {
+                    type = ErrorType.badRequest;
+                } else if (tmp.equals("invalidPath")) {
+                    type = ErrorType.badRequest;
+                } else if (tmp.equals("notSupported")) {
+                    type = ErrorType.notSupported;
+                } else {
+                    type = ErrorType.internalError;
+                }
+                msg = map.getString("msg");
+                detail = map.getString("detail");
+                if (msg == null) {
+                    msg = detail;
+                }
+                if (msg == null) {
+                    msg = details.toString();
+                }
+            } else {
+                type = ErrorType.internalError;
+                msg = details.toString();
+            }
+            if (msg == null) {
+                msg = "";
+            }
+            stub.handleError(type, msg);
+        } catch (Exception x) {
+            error(getPath(), x);
+        }
+    }
+
+    /**
+     * Called by the parent session to handle response messages.
+     */
+    public void handleResponse(Integer rid, DSMap map) {
+        if (rid == 0) {
+            processUpdates(map);
+        } else {
+            DSOutboundStub stub = getRequest(rid);
+            if (stub != null) {
+                if (isError(map)) {
+                    handleError(stub, map.get("error"));
+                    stub.handleClose();
+                    removeRequest(rid);
+                } else {
+                    stub.handleResponse(map);
+                    if (isStreamClosed(map)) {
+                        stub.handleClose();
+                        removeRequest(rid);
+                    }
+                }
+            } else {
+                if (!isStreamClosed(map)) {
+                    sendClose(rid);
+                }
+            }
+        }
+    }
+
+    private boolean isError(DSMap message) {
+        DSElement e = message.get("error");
+        if (e == null) {
+            return false;
+        }
+        return !e.isNull();
+    }
+
+    private boolean isStreamClosed(DSMap message) {
+        return "closed".equals(message.getString("stream"));
+    }
+
+    private void processUpdate(DSElement updateElement) {
+        int sid = -1;
+        DSElement value;
+        String ts, sts = null;
+        if (updateElement instanceof DSList) {
+            DSList updateList = (DSList) updateElement;
+            int cols = updateList.size();
+            if (cols < 3) {
+                trace(trace() ? "Update incomplete: " + updateList.toString() : null);
+                return;
+            }
+            sid = updateList.get(0, -1);
+            value = updateList.get(1);
+            ts = updateList.getString(2);
+            sts = updateList.get(3, (String) null);
+        } else if (updateElement instanceof DSMap) {
+            DSMap updateMap = (DSMap) updateElement;
+            sid = updateMap.get("sid", -1);
+            value = updateMap.get("value");
+            ts = updateMap.getString("ts");
+            sts = updateMap.get("status", (String) null);
+        } else {
+            return;
+        }
+        if (sid < 0) {
+            debug(debug() ? "Update missing sid: " + updateElement.toString() : null);
+            return;
+        }
+        getSubscriptions().handleUpdate(sid, ts, sts, value);
+    }
+
+    @Override
+    public void onConnect() {
+        super.onConnect();
+        getSession().setRequesterAllowed();
+    }
+
+    private void processUpdates(DSMap map) {
+        DSList updates = map.getList("updates");
+        for (int i = 0; i < updates.size(); i++) {
+            DSElement update = updates.get(i);
+            processUpdate(update);
+        }
+    }
+
+    @Override
+    public void sendClose(Integer rid) {
+        removeRequest(rid);
+        sendRequest(new CloseMessage(rid, true));
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1Responder.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/DS1Responder.java
similarity index 51%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1Responder.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/DS1Responder.java
index e376a2f9..4e916b24 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/protocol_v1/responder/DS1Responder.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/DS1Responder.java
@@ -1,72 +1,46 @@
-package com.acuity.iot.dsa.dslink.protocol.protocol_v1.responder;
+package com.acuity.iot.dsa.dslink.protocol.v1.responder;
 
-import com.acuity.iot.dsa.dslink.DSProtocolException;
-import com.acuity.iot.dsa.dslink.DSResponderSession;
-import com.acuity.iot.dsa.dslink.protocol.message.CloseMessage;
-import com.acuity.iot.dsa.dslink.protocol.message.ErrorResponse;
-import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Session;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Stream;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import com.acuity.iot.dsa.dslink.protocol.DSProtocolException;
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.DSStream;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundInvoke;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundList;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundRequest;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSet;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscriptions;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSResponder;
+import com.acuity.iot.dsa.dslink.protocol.v1.CloseMessage;
 import org.iot.dsa.DSRuntime;
-import org.iot.dsa.dslink.DSIResponder;
-import org.iot.dsa.dslink.DSLinkConnection;
+import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
-import org.iot.dsa.node.DSNode;
+import org.iot.dsa.security.DSPermission;
 
 /**
- * Implements DSA 1.1.2
+ * Implementation DSA v1.
  *
  * @author Aaron Hansen
  */
-public class DS1Responder extends DSNode implements DSResponderSession {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
+public class DS1Responder extends DSResponder {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private ConcurrentHashMap<Integer, DS1Stream> inboundRequests =
-            new ConcurrentHashMap<Integer, DS1Stream>();
-    private Logger logger;
-    private DS1Session session;
-    private DSIResponder responder;
-    private DS1InboundSubscriptions subscriptions =
-            new DS1InboundSubscriptions(this);
+    private DSInboundSubscriptions subscriptions = new DSInboundSubscriptions(this);
 
     /////////////////////////////////////////////////////////////////
     // Methods - Constructors
     /////////////////////////////////////////////////////////////////
 
-    public DS1Responder(DS1Session session) {
-        this.session = session;
+    public DS1Responder(DSSession session) {
+        super(session);
     }
 
     /////////////////////////////////////////////////////////////////
     // Methods - In alphabetical order by method name.
     /////////////////////////////////////////////////////////////////
 
-    @Override
-    public DSLinkConnection getConnection() {
-        return session.getConnection();
-    }
-
-    @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(
-                    getConnection().getLink().getLinkName() + ".responderSession");
-        }
-        return logger;
-    }
-
     /**
      * Will throw an exception if the request doesn't have the path.
      */
@@ -78,87 +52,33 @@ private String getPath(DSMap req) {
         return path;
     }
 
-    public DS1InboundSubscriptions getSubscriptions() {
+    @Override
+    protected DSInboundSubscriptions getSubscriptions() {
         return subscriptions;
     }
 
-    public void onConnect() {
-    }
-
-    public void onConnectFail() {
-    }
-
-    public void onDisconnect() {
-        finer(finer() ? "Close" : null);
-        subscriptions.close();
-        for (Map.Entry<Integer, DS1Stream> entry : inboundRequests.entrySet()) {
-            try {
-                entry.getValue().onClose(entry.getKey());
-            } catch (Exception x) {
-                finer(finer() ? "Close" : null, x);
-            }
-        }
-        inboundRequests.clear();
-    }
-
-    /**
-     * Handles an invoke request.
-     */
-    private void processInvoke(Integer rid, DSMap req) {
-        DS1InboundInvoke invokeImpl = new DS1InboundInvoke(req);
-        invokeImpl.setPath(getPath(req))
-                  .setSession(session)
-                  .setRequestId(rid)
-                  .setResponderImpl(responder)
-                  .setResponder(this);
-        inboundRequests.put(rid, invokeImpl);
-        DSRuntime.run(invokeImpl);
-    }
-
-    /**
-     * Handles a list request.
-     */
-    private void processList(Integer rid, DSMap req) {
-        DS1InboundList listImpl = new DS1InboundList();
-        listImpl.setPath(getPath(req))
-                .setSession(session)
-                .setRequest(req)
-                .setRequestId(rid)
-                .setResponderImpl(responder)
-                .setResponder(this);
-        inboundRequests.put(listImpl.getRequestId(), listImpl);
-        DSRuntime.run(listImpl);
-    }
-
     /**
      * Process an individual request.
      */
-    public void processRequest(final Integer rid, final DSMap map) {
-        if (responder == null) {
-            responder = getConnection().getLink();
-        }
-        if (responder == null) {
-            throw new DSProtocolException("Not a responder");
-        }
+    public void handleRequest(final Integer rid, final DSMap map) {
         String method = map.get("method", null);
         try {
             if ((method == null) || method.isEmpty()) {
-                throwInvalidMethod(method, map);
+                sendInvalidMethod(rid, method);
             }
             switch (method.charAt(0)) {
                 case 'c':  //close
                     if (!method.equals("close")) {
-                        throwInvalidMethod(method, map);
+                        sendInvalidMethod(rid, method);
                     }
-                    final DS1Stream req = inboundRequests.remove(rid);
+                    final DSStream req = removeRequest(rid);
                     if (req != null) {
                         DSRuntime.run(new Runnable() {
                             public void run() {
                                 try {
                                     req.onClose(rid);
                                 } catch (Exception x) {
-                                    getConnection().getLink().getLogger().log(
-                                            Level.FINE, getConnection().getConnectionId(), x);
+                                    fine(getPath(), x);
                                 }
                             }
                         });
@@ -166,24 +86,23 @@ public void run() {
                     break;
                 case 'i':  //invoke
                     if (!method.equals("invoke")) {
-                        throwInvalidMethod(method, map);
+                        sendInvalidMethod(rid, method);
                     }
                     processInvoke(rid, map);
                     break;
                 case 'l':  //list
                     if (!method.equals("list")) {
-                        throwInvalidMethod(method, map);
+                        sendInvalidMethod(rid, method);
                     }
                     processList(rid, map);
                     break;
                 case 'r':  //remove
                     if (method.equals("remove")) {
                         //Does this even make sense in a link?
-                        severe("Remove method called");
-                        sendResponse(
-                                new CloseMessage(rid).setMethod(null).setStream("closed"));
+                        error("Remove method called");
+                        sendClose(rid);
                     } else {
-                        throwInvalidMethod(method, map);
+                        sendInvalidMethod(rid, method);
                     }
                     break;
                 case 's':  //set, subscribe
@@ -196,14 +115,14 @@ public void run() {
                                 processSubscribe(rid, map);
                             }
                         });
-                        sendResponse(new CloseMessage(rid).setMethod(null));
+                        sendClose(rid);
                     } else {
-                        throwInvalidMethod(method, map);
+                        sendInvalidMethod(rid, method);
                     }
                     break;
                 case 'u':
                     if (!method.equals("unsubscribe")) {
-                        throwInvalidMethod(method, map);
+                        sendInvalidMethod(rid, method);
                     }
                     DSRuntime.run(new Runnable() {
                         @Override
@@ -211,30 +130,61 @@ public void run() {
                             processUnsubscribe(rid, map);
                         }
                     });
-                    sendResponse(new CloseMessage(rid).setMethod(null));
+                    sendClose(rid);
                     break;
                 default:
-                    throwInvalidMethod(method, map);
+                    sendInvalidMethod(rid, method);
             }
         } catch (DSProtocolException x) {
-            sendResponse(new ErrorResponse(x).parseRequest(map));
+            sendError(rid, x);
         } catch (Throwable x) {
-            DSProtocolException px = new DSProtocolException(x.getMessage());
-            px.setDetail(x);
-            px.setType("serverError");
-            sendResponse(new ErrorResponse(px).parseRequest(map));
+            error(getPath(), x);
+            sendError(rid, x);
         }
     }
 
+    /**
+     * Handles an invoke request.
+     */
+    private void processInvoke(Integer rid, DSMap req) {
+        String permit = req.get("permit", "config");
+        DSPermission permission = DSPermission.forString(permit);
+        DSInboundInvoke invokeImpl = new DSInboundInvoke(req.getMap("params"), permission);
+        invokeImpl.setPath(getPath(req))
+                  .setSession(getSession())
+                  .setRequestId(rid)
+                  .setLink(getLink())
+                  .setResponder(this);
+        putRequest(rid, invokeImpl);
+        DSRuntime.run(invokeImpl);
+    }
+
+    /**
+     * Handles a list request.
+     */
+    private void processList(Integer rid, DSMap req) {
+        DSInboundList listImpl = new DSInboundList();
+        listImpl.setPath(getPath(req))
+                .setSession(getSession())
+                .setRequestId(rid)
+                .setLink(getLink())
+                .setResponder(this);
+        putRequest(listImpl.getRequestId(), listImpl);
+        DSRuntime.run(listImpl);
+    }
+
     /**
      * Handles a set request.
      */
     private void processSet(Integer rid, DSMap req) {
-        DS1InboundSet setImpl = new DS1InboundSet(req);
+        String permit = req.get("permit", "config");
+        DSPermission permission = DSPermission.forString(permit);
+        DSElement value = req.get("value");
+        DSInboundSet setImpl = new DSInboundSet(value, permission);
         setImpl.setPath(getPath(req))
-               .setSession(session)
+               .setSession(getSession())
                .setRequestId(rid)
-               .setResponderImpl(responder)
+               .setLink(getLink())
                .setResponder(this);
         DSRuntime.run(setImpl);
     }
@@ -257,7 +207,7 @@ private void processSubscribe(int rid, DSMap req) {
             sid = subscribe.getInt("sid");
             qos = subscribe.get("qos", 0);
             try {
-                subscriptions.subscribe(responder, sid, path, qos);
+                subscriptions.subscribe(sid, path, qos);
             } catch (Exception x) {
                 //invalid paths are very common
                 fine(path, x);
@@ -277,33 +227,31 @@ private void processUnsubscribe(int rid, DSMap req) {
                     sid = list.getInt(i);
                     subscriptions.unsubscribe(sid);
                 } catch (Exception x) {
-                    fine(fine() ? "Unsubscribe: " + sid : null, x);
+                    error(fine() ? "Unsubscribe: " + sid : null, x);
                 }
             }
         }
     }
 
-    void removeInboundRequest(Integer requestId) {
-        inboundRequests.remove(requestId);
+    public void sendClose(int rid) {
+        sendResponse(new CloseMessage(rid));
     }
 
-    @Override
-    public boolean shouldEndMessage() {
-        return session.shouldEndMessage();
+    public void sendError(int rid, Throwable reason) {
+        sendResponse(new ErrorMessage(rid, reason));
     }
 
-    @Override
-    public void sendResponse(OutboundMessage res) {
-        session.enqueueOutgoingResponse(res);
+    public void sendError(DSInboundRequest req, Throwable reason) {
+        sendResponse(new ErrorMessage(req.getRequestId(), reason));
     }
 
     /**
      * Used throughout processRequest.
      */
-    private void throwInvalidMethod(String methodName, DSMap request) {
-        String msg = "Invalid method name " + methodName;
-        finest(finest() ? (msg + ": " + request.toString()) : null);
-        throw new DSProtocolException(msg).setType("invalidMethod");
+    private void sendInvalidMethod(int rid, String methodName) {
+        String msg = "Invalid method: " + methodName;
+        error(msg);
+        sendResponse(new ErrorMessage(rid, msg).setType("invalidMethod"));
     }
 
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/ErrorMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/ErrorMessage.java
new file mode 100644
index 00000000..7d0256aa
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/responder/ErrorMessage.java
@@ -0,0 +1,77 @@
+package com.acuity.iot.dsa.dslink.protocol.v1.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import org.iot.dsa.dslink.DSInvalidPathException;
+import org.iot.dsa.dslink.DSPermissionException;
+import org.iot.dsa.dslink.DSRequestException;
+import org.iot.dsa.io.DSIWriter;
+
+/**
+ * Responder uses to close streams without errors.
+ *
+ * @author Aaron Hansen
+ */
+class ErrorMessage implements OutboundMessage {
+
+    private static String SERVER_ERROR;
+
+    private Integer rid;
+    private String message;
+
+    private String type = SERVER_ERROR;
+
+    public ErrorMessage(Integer requestId, String message) {
+        this.rid = requestId;
+        this.message = message;
+    }
+
+    public ErrorMessage(Integer requestId, Throwable reason) {
+        this.rid = requestId;
+        this.message = toString(reason);
+        if (reason instanceof DSRequestException) {
+            if (reason instanceof DSInvalidPathException) {
+                setType("invalidPath");
+            } else if (reason instanceof DSPermissionException) {
+                setType("permissionDenied");
+            } else {
+                setType("invalidRequest");
+            }
+        } else {
+            setType("serverError");
+        }
+    }
+
+    public ErrorMessage setType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    private String toString(Throwable arg) {
+        String msg = arg.getMessage();
+        if ((msg != null) && (msg.length() > 0)) {
+            return msg;
+        }
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        arg.printStackTrace(pw);
+        pw.close();
+        return sw.toString();
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DSIWriter out = writer.getWriter();
+        out.beginMap()
+           .key("rid").value(rid)
+           .key("stream").value("closed");
+        out.key("error").beginMap()
+           .key("type").value(type)
+           .key("msg").value(message)
+           .endMap();
+        out.endMap();
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/AckMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/AckMessage.java
new file mode 100644
index 00000000..658681ad
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/AckMessage.java
@@ -0,0 +1,26 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+
+/**
+ * @author Aaron Hansen
+ */
+class AckMessage implements MessageConstants, OutboundMessage {
+
+    private DS2Session session;
+
+    public AckMessage(DS2Session session) {
+        this.session = session;
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.init(-1, -1);
+        out.setMethod(MSG_ACK);
+        out.getBody().putInt(session.getNextAck(), false);
+        out.write(session.getTransport());
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/CloseMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/CloseMessage.java
new file mode 100644
index 00000000..e2c07531
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/CloseMessage.java
@@ -0,0 +1,38 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+
+/**
+ * Responder uses to close streams without errors.
+ *
+ * @author Aaron Hansen
+ */
+public class CloseMessage implements MessageConstants, OutboundMessage {
+
+    private byte method = MSG_CLOSE;
+    private DSSession session;
+    private int rid;
+
+    public CloseMessage(DSSession session, int requestId) {
+        this.session = session;
+        this.rid = requestId;
+    }
+
+    public CloseMessage(DSSession session, int requestId, byte method) {
+        this.method = method;
+        this.session = session;
+        this.rid = requestId;
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.init(rid, session.getNextAck());
+        out.setMethod(method);
+        out.write((DSBinaryTransport) session.getTransport());
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2LinkConnection.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2LinkConnection.java
new file mode 100644
index 00000000..5f6a41a0
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2LinkConnection.java
@@ -0,0 +1,313 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import static com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants.HDR_STATUS;
+import static com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants.STS_INITIALIZING;
+import static com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants.STS_INVALID_AUTH;
+import static com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants.STS_OK;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import com.acuity.iot.dsa.dslink.transport.SocketTransport;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.SecureRandom;
+import org.iot.dsa.dslink.DSIRequester;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.dslink.DSLinkConfig;
+import org.iot.dsa.dslink.DSLinkConnection;
+import org.iot.dsa.dslink.DSPermissionException;
+import org.iot.dsa.node.DSBool;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.node.DSString;
+import org.iot.dsa.security.DSKeys;
+import org.iot.dsa.time.DSDateTime;
+import org.iot.dsa.util.DSException;
+
+/**
+ * The DSA V2 connection implementation. Performs connection initialization with the broker,
+ * then creates a transport and session based on the broker response.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2LinkConnection extends DSLinkConnection {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final String BROKER_AUTH = "Broker Auth";
+    private static final String BROKER_ID = "Broker DSID";
+    private static final String BROKER_PATH = "Broker Path";
+    private static final String BROKER_PUB_KEY = "Broker Public Key";
+    private static final String BROKER_SALT = "Broker Salt";
+    private static final String BROKER_URI = "Broker URI";
+    protected static final String LAST_CONNECT_OK = "Last Connect Ok";
+    private static final String LAST_CONNECT_FAIL = "Last Connect Fail";
+    private static final String LINK_SALT = "Link Salt";
+    private static final String FAIL_CAUSE = "Fail Cause";
+    private static final String REQUESTER_ALLOWED = "Requester Allowed";
+    private static final String SESSION = "Status";
+    protected static final String STATUS = "Status";
+    private static final String TRANSPORT = "Transport";
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSInfo brokerAuth = getInfo(BROKER_AUTH);
+    private DSInfo brokerDsId = getInfo(BROKER_ID);
+    private DSInfo brokerPath = getInfo(BROKER_PATH);
+    private DSInfo brokerPubKey = getInfo(BROKER_PUB_KEY);
+    private DSInfo brokerSalt = getInfo(BROKER_SALT);
+    private DSInfo brokerUri = getInfo(BROKER_URI);
+    private DSInfo linkSalt = getInfo(LINK_SALT);
+    private DSInfo requesterAllowed = getInfo(REQUESTER_ALLOWED);
+    private DS2Session session;
+    private DSBinaryTransport transport;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public void declareDefaults() {
+        declareDefault(STATUS, DSStatus.down).setTransient(true).setReadOnly(true);
+        declareDefault(LAST_CONNECT_OK, DSDateTime.NULL).setTransient(true).setReadOnly(true);
+        declareDefault(LAST_CONNECT_FAIL, DSDateTime.NULL).setTransient(true).setReadOnly(true);
+        declareDefault(FAIL_CAUSE, DSString.NULL).setTransient(true).setReadOnly(true);
+        declareDefault(BROKER_URI, DSString.NULL).setTransient(true).setReadOnly(true);
+        declareDefault(BROKER_PATH, DSString.NULL).setTransient(true).setReadOnly(true);
+        declareDefault(BROKER_ID, DSString.NULL).setTransient(true).setReadOnly(true);
+        declareDefault(BROKER_AUTH, DSBytes.NULL)
+                .setTransient(true).setReadOnly(true).setAdmin(true);
+        declareDefault(BROKER_PUB_KEY, DSBytes.NULL)
+                .setTransient(true).setReadOnly(true).setAdmin(true);
+        declareDefault(BROKER_SALT, DSBytes.NULL)
+                .setTransient(true).setReadOnly(true).setAdmin(true);
+        declareDefault(LINK_SALT, DSBytes.NULL)
+                .setTransient(true).setReadOnly(true).setAdmin(true);
+        declareDefault(REQUESTER_ALLOWED, DSBool.FALSE).setTransient(true).setReadOnly(true);
+    }
+
+    @Override
+    public void disconnect() {
+        if (session != null) {
+            session.disconnect();
+        }
+    }
+
+    private byte[] getLinkSalt() {
+        if (linkSalt.getObject().isNull()) {
+            byte[] tmp = new byte[32];
+            SecureRandom random = new SecureRandom();
+            random.nextBytes(tmp);
+            put(linkSalt, DSBytes.valueOf(tmp));
+        }
+        return linkSalt.getElement().toBytes();
+    }
+
+    @Override
+    public DSIRequester getRequester() {
+        return session.getRequester();
+    }
+
+    @Override
+    public DS2Session getSession() {
+        return session;
+    }
+
+    @Override
+    public DSBinaryTransport getTransport() {
+        return transport;
+    }
+
+    /**
+     * Looks at the connection initialization response to determine the type of transport then
+     * instantiates the correct type fom the config.
+     */
+    protected DSBinaryTransport makeTransport() {
+        DSTransport.Factory factory = null;
+        String uri = getLink().getConfig().getBrokerUri();
+        put(brokerUri, DSString.valueOf(uri));
+        transport = null;
+        if (uri.startsWith("ws")) {
+            try {
+                String type = getLink().getConfig().getConfig(
+                        DSLinkConfig.CFG_WS_TRANSPORT_FACTORY,
+                        "org.iot.dsa.dslink.websocket.StandaloneTransportFactory");
+                factory = (DSTransport.Factory) Class.forName(type).newInstance();
+                transport = factory.makeBinaryTransport(this);
+            } catch (Exception x) {
+                DSException.throwRuntime(x);
+            }
+        } else if (uri.startsWith("ds")) {
+            transport = new SocketTransport();
+        }
+        transport.setConnectionUrl(uri);
+        fine(fine() ? "Connection URL = " + uri : null);
+        return transport;
+    }
+
+    @Override
+    protected void onConnect() {
+        transport.open();
+        session.onConnect();
+        try {
+            performHandshake();
+        } catch (Exception x) {
+            session.onConnectFail();
+            DSException.throwRuntime(x);
+        }
+    }
+
+    @Override
+    protected void onDisconnect() {
+        session.onDisconnect();
+        put(STATUS, DSStatus.down);
+        transport.close();
+        transport = null;
+        remove(TRANSPORT);
+    }
+
+    @Override
+    protected void onInitialize() {
+        if (session == null) {
+            session = new DS2Session(this);
+            put(SESSION, session);
+        }
+        transport = makeTransport();
+        put(TRANSPORT, transport);
+        transport.setConnection(this);
+    }
+
+    /**
+     * The long term management of the connection (reading and writing).  When this
+     * returns, onDisconnect will be called.
+     */
+    @Override
+    protected void onRun() {
+        session.run();
+    }
+
+    protected void performHandshake() {
+        try {
+            sendF0();
+            recvF1();
+            sendF2();
+            recvF3();
+            put(LAST_CONNECT_OK, DSDateTime.currentTime());
+            put(STATUS, DSStatus.ok);
+        } catch (Exception io) {
+            put(STATUS, DSStatus.fault);
+            put(LAST_CONNECT_FAIL, DSDateTime.currentTime());
+            put(FAIL_CAUSE, DSString.valueOf(DSException.makeMessage(io)));
+            DSException.throwRuntime(io);
+        }
+    }
+
+    private void recvF1() throws IOException {
+        InputStream in = transport.getInput();
+        DS2MessageReader reader = new DS2MessageReader();
+        reader.init(in);
+        if (reader.getMethod() != 0xf1) {
+            throw new IllegalStateException("Expecting handshake method 0xF1 not 0x" +
+                                                    Integer.toHexString(reader.getMethod()));
+        }
+        Byte status = (Byte) reader.getHeader(HDR_STATUS);
+        if (status != null) {
+            switch (status.intValue()) {
+                case STS_OK:
+                case STS_INITIALIZING:
+                    break;
+                case STS_INVALID_AUTH:
+                    throw new DSPermissionException("Invalid Auth");
+                default:
+                    throw new IllegalStateException("Unexpected status: 0x" +
+                                                            DSBytes.toHex(status, null));
+            }
+        }
+        put(brokerDsId, DSString.valueOf(reader.readString(in)));
+        byte[] tmp = new byte[65];
+        int len = in.read(tmp);
+        if (len != 65) {
+            throw new IllegalStateException("Broker pub key not 65 bytes: " + len);
+        }
+        put(BROKER_PUB_KEY, DSBytes.valueOf(tmp));
+        tmp = new byte[32];
+        len = in.read(tmp);
+        if (len != 32) {
+            throw new IllegalStateException("Broker salt not 32 bytes: " + len);
+        }
+        put(BROKER_SALT, DSBytes.valueOf(tmp));
+    }
+
+    private void recvF3() throws IOException {
+        InputStream in = transport.getInput();
+        DS2MessageReader reader = new DS2MessageReader();
+        reader.init(in);
+        if (reader.getMethod() != 0xf3) {
+            throw new IllegalStateException("Expecting handshake method 0xF3 not 0x" +
+                                                    Integer.toHexString(reader.getMethod()));
+        }
+        Byte status = (Byte) reader.getHeader(HDR_STATUS);
+        if (status != null) {
+            switch (status.intValue()) {
+                case STS_OK:
+                case STS_INITIALIZING:
+                    break;
+                case STS_INVALID_AUTH:
+                    throw new DSPermissionException("Invalid Auth");
+                default:
+                    throw new IllegalStateException("Unexpected status: 0x" +
+                                                            DSBytes.toHex(status, null));
+            }
+        }
+        boolean allowed = in.read() == 1;
+        put(requesterAllowed, DSBool.valueOf(allowed));
+        if (allowed) {
+            session.setRequesterAllowed();
+        }
+        String pathOnBroker = reader.readString(in);
+        put(brokerPath, DSString.valueOf(pathOnBroker));
+        byte[] tmp = new byte[32];
+        in.read(tmp);
+        put(brokerAuth, DSBytes.valueOf(tmp));
+    }
+
+    private void sendF0() {
+        DSLink link = getLink();
+        String dsId = link.getDsId();
+        DSKeys dsKeys = link.getKeys();
+        DS2MessageWriter writer = new DS2MessageWriter();
+        writer.setMethod(0xf0);
+        DSByteBuffer buffer = writer.getBody();
+        buffer.put((byte) 2).put((byte) 0); //dsa version
+        writer.writeString(dsId, buffer);
+        buffer.put(dsKeys.encodePublic());
+        buffer.put(getLinkSalt());
+        writer.write(transport);
+    }
+
+    private void sendF2() throws Exception {
+        DS2MessageWriter writer = new DS2MessageWriter();
+        writer.setMethod(0xf2);
+        DSByteBuffer buffer = writer.getBody();
+        String token = getLink().getConfig().getToken();
+        if (token == null) {
+            token = "";
+        }
+        writer.writeString(token, buffer);
+        buffer.put((byte) 0x01); //isResponder
+        writer.writeString("", buffer); //blank server path
+        byte[] sharedSecret = getLink().getKeys().generateSharedSecret(
+                brokerPubKey.getElement().toBytes());
+        byte[] tmp = brokerSalt.getElement().toBytes();
+        byte[] authBytes = DSKeys.generateHmacSHA256Signature(tmp, sharedSecret);
+        buffer.put(authBytes);
+        writer.write(transport);
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Message.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Message.java
new file mode 100644
index 00000000..d56759c9
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Message.java
@@ -0,0 +1,172 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import java.util.Map;
+import org.iot.dsa.logging.DSLogger;
+import org.iot.dsa.node.DSBytes;
+
+/**
+ * Methods common to the reader and writer.
+ *
+ * @author Aaron Hansen
+ */
+abstract class DS2Message extends DSLogger implements MessageConstants {
+
+    private StringBuilder logBuffer;
+
+    protected StringBuilder debugMethod(int arg, StringBuilder buf) {
+        if (buf == null) {
+            buf = new StringBuilder();
+        }
+        switch (arg) {
+            case MSG_SUBSCRIBE_REQ:
+                buf.append("Sub req");
+                break;
+            case MSG_SUBSCRIBE_RES:
+                buf.append("Sub res");
+                break;
+            case MSG_LIST_REQ:
+                buf.append("List req");
+                break;
+            case MSG_LIST_RES:
+                buf.append("List res");
+                break;
+            case MSG_INVOKE_REQ:
+                buf.append("Invoke req");
+                break;
+            case MSG_INVOKE_RES:
+                buf.append("Invoke res");
+                break;
+            case MSG_SET_REQ:
+                buf.append("Set req");
+                break;
+            case MSG_SET_RES:
+                buf.append("Set res");
+                break;
+            case MSG_OBSERVE_REQ:
+                buf.append("Obs req");
+                break;
+            case MSG_CLOSE:
+                buf.append("Close");
+                break;
+            case MSG_ACK:
+                buf.append("Ack");
+                break;
+            case MSG_PING:
+                buf.append("Ping");
+                break;
+            case MSG_HANDSHAKE_1:
+                buf.append("Handshake 1");
+                break;
+            case MSG_HANDSHAKE_2:
+                buf.append("Handshake 2");
+                break;
+            case MSG_HANDSHAKE_3:
+                buf.append("Handshake 3");
+                break;
+            case MSG_HANDSHAKE_4:
+                buf.append("Handshake 4");
+                break;
+            default:
+                buf.append("0x");
+                DSBytes.toHex((byte) arg, buf);
+        }
+        return buf;
+    }
+
+    private StringBuilder debugHeader(int arg, StringBuilder buf) {
+        if (buf == null) {
+            buf = new StringBuilder();
+        }
+        switch (arg) {
+            case HDR_STATUS:
+                buf.append("Status");
+                break;
+            case HDR_SEQ_ID:
+                buf.append("Seq ID");
+                break;
+            case HDR_PAGE_ID:
+                buf.append("Page ID");
+                break;
+            case HDR_AUDIT:
+                buf.append("Audit");
+                break;
+            case HDR_ERROR_DETAIL:
+                buf.append("Error Detail");
+                break;
+            case HDR_ALIAS_COUNT:
+                buf.append("Alias Ct");
+                break;
+            case HDR_PRIORITY:
+                buf.append("Priority");
+                break;
+            case HDR_NO_STREAM:
+                buf.append("No Stream");
+                break;
+            case HDR_QOS:
+                buf.append("QOS");
+                break;
+            case HDR_QUEUE_SIZE:
+                buf.append("Queue Size");
+                break;
+            case HDR_QUEUE_DURATION:
+                buf.append("Queue Duration");
+                break;
+            case HDR_REFRESHED:
+                buf.append("Refreshed");
+                break;
+            case HDR_PUB_PATH:
+                buf.append("Pub Path");
+                break;
+            case HDR_SKIPPABLE:
+                buf.append("Skippable");
+                break;
+            case HDR_MAX_PERMISSION:
+                buf.append("Max Perm");
+                break;
+            case HDR_ATTRIBUTE_FIELD:
+                buf.append("Attr Field");
+                break;
+            case HDR_PERMISSION_TOKEN:
+                buf.append("Perm Token");
+                break;
+            case HDR_TARGET_PATH:
+                buf.append("Target Path");
+                break;
+            case HDR_SOURCE_PATH:
+                buf.append("Source Path");
+                break;
+            default:
+                buf.append("0x");
+                DSBytes.toHex((byte) arg, buf);
+        }
+        return buf;
+    }
+
+    protected void debugHeaders(Map<Integer, Object> headers, StringBuilder buf) {
+        for (Map.Entry<Integer, Object> e : headers.entrySet()) {
+            buf.append(", ");
+            debugHeader(e.getKey(), buf);
+            if (e.getValue() != NO_HEADER_VAL) {
+                buf.append("=");
+                buf.append(e.getValue());
+            }
+        }
+    }
+
+    protected abstract void getDebug(StringBuilder buf);
+
+    private StringBuilder getLogBuffer() {
+        if (logBuffer == null) {
+            logBuffer = new StringBuilder();
+        }
+        return logBuffer;
+    }
+
+    protected void printDebug() {
+        StringBuilder buf = getLogBuffer();
+        getDebug(buf);
+        debug(buf.toString());
+        buf.setLength(0);
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageReader.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageReader.java
new file mode 100644
index 00000000..1abae9ea
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageReader.java
@@ -0,0 +1,290 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.node.DSString;
+import org.iot.dsa.util.DSException;
+
+/**
+ * Used to read a DSA 2.n message (header and body).  Call init(InputStream) to start a new message,
+ * can be reused for multiple messages. Not thread safe, the intent is messages will be constructed
+ * and read serially.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2MessageReader extends DS2Message {
+
+    // Fields
+    // ------
+
+    private int ackId;
+    private int bodyLength;
+    private CharBuffer charBuffer;
+    private Map<Integer, Object> headers = new HashMap<Integer, Object>();
+    private InputStream input;
+    private int method;
+    private MsgpackReader reader;
+    private int requestId;
+    private ByteBuffer strBuffer;
+    private CharsetDecoder utf8decoder = DSString.UTF8.newDecoder();
+
+    // Constructors
+    // ------------
+
+    public DS2MessageReader() {
+    }
+
+    // Methods
+    // -------
+
+    @Override
+    protected void getDebug(StringBuilder buf) {
+        buf.append("RECV ");
+        debugMethod(getMethod(), buf);
+        if (requestId > 0) {
+            buf.append(", ").append("Rid ").append(requestId);
+        }
+        if (ackId > 0) {
+            buf.append(", ").append("Ack ").append(ackId);
+        }
+        debugHeaders(headers, buf);
+    }
+
+    public int getAckId() {
+        return ackId;
+    }
+
+    public InputStream getBody() {
+        return input;
+    }
+
+    public MsgpackReader getBodyReader() {
+        if (reader == null) {
+            reader = new MsgpackReader(input);
+        }
+        return reader;
+    }
+
+    public int getBodyLength() {
+        return bodyLength;
+    }
+
+    /**
+     * Returns a char buffer with the given capacity, ready for writing (putting).  Attempts to
+     * reuse the same char buffer.
+     */
+    private CharBuffer getCharBuffer(int size) {
+        if ((charBuffer == null) || (charBuffer.length() < size)) {
+            int tmp = 1024;
+            while (tmp < size) {
+                tmp += 1024;
+            }
+            charBuffer = CharBuffer.allocate(tmp);
+        } else {
+            charBuffer.clear();
+        }
+        return charBuffer;
+    }
+
+    public Object getHeader(Integer key) {
+        return headers.get(key);
+    }
+
+    public Object getHeader(Integer key, Object def) {
+        Object ret = headers.get(key);
+        if (ret == null) {
+            ret = def;
+        }
+        return ret;
+    }
+
+    public Map<Integer, Object> getHeaders() {
+        return headers;
+    }
+
+    public int getMethod() {
+        return method;
+    }
+
+    public int getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * Called by readString(), returns a bytebuffer for the given capacity ready for writing
+     * (putting).  Attempts to reuse the same buffer as much as possible.
+     */
+    private ByteBuffer getStringBuffer(int len) {
+        if (strBuffer == null) {
+            int tmp = 1024;
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            strBuffer = ByteBuffer.allocate(tmp);
+        } else if (strBuffer.capacity() < len) {
+            int tmp = strBuffer.capacity();
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            strBuffer = ByteBuffer.allocate(tmp);
+        } else {
+            strBuffer.clear();
+        }
+        return strBuffer;
+    }
+
+    void init(int requestId,
+              int method,
+              DSByteBuffer body,
+              Map<Integer, Object> headers) {
+        this.requestId = requestId;
+        this.method = method;
+        input = body;
+        bodyLength = body.length();
+        this.headers.clear();
+        this.headers.putAll(headers);
+    }
+
+    public void init(InputStream in) {
+        try {
+            input = in;
+            getBodyReader().reset();
+            headers.clear();
+            int tlen = DSBytes.readInt(in, false);
+            int hlen = DSBytes.readShort(in, false);
+            bodyLength = tlen - hlen;
+            method = in.read() & 0xFF;
+            hlen -= 7;
+            requestId = -1;
+            ackId = -1;
+            if (hlen >= 4) {
+                requestId = DSBytes.readInt(in, false);
+                hlen -= 4;
+                if (hlen >= 4) {
+                    ackId = DSBytes.readInt(in, false);
+                    hlen -= 4;
+                }
+                if (hlen > 0) {
+                    parseDynamicHeaders(in, hlen, headers);
+                }
+            }
+            if (debug()) {
+                printDebug();
+            }
+        } catch (IOException x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    public boolean isAck() {
+        return method == MSG_ACK;
+    }
+
+    public boolean isPing() {
+        return method == MSG_PING;
+    }
+
+    public boolean isMultipart() {
+        Integer page = (Integer) headers.get(HDR_PAGE_ID);
+        return page != null;
+    }
+
+    public boolean isRequest() {
+        switch (method) {
+            case MSG_CLOSE:
+            case MSG_INVOKE_REQ:
+            case MSG_LIST_REQ:
+            case MSG_OBSERVE_REQ:
+            case MSG_SUBSCRIBE_REQ:
+            case MSG_SET_REQ:
+                return true;
+        }
+        return false;
+    }
+
+    public boolean isResponse() {
+        return (method & 0x80) != 0;
+    }
+
+    void parseDynamicHeaders(InputStream in, int len, Map<Integer, Object> headers)
+            throws IOException {
+        int code;
+        Object val;
+        while (len > 0) {
+            code = in.read() & 0xFF;
+            len--;
+            switch (code) {
+                case HDR_STATUS:
+                case HDR_ALIAS_COUNT:
+                case HDR_QOS:
+                case HDR_MAX_PERMISSION:
+                    val = (byte) in.read();
+                    len--;
+                    break;
+                case HDR_SEQ_ID:
+                case HDR_PAGE_ID:
+                case HDR_QUEUE_SIZE:
+                case HDR_QUEUE_DURATION:
+                    val = DSBytes.readInt(in, false);
+                    len -= 4;
+                    break;
+                case HDR_AUDIT:
+                case HDR_ERROR_DETAIL:
+                case HDR_PUB_PATH:
+                case HDR_ATTRIBUTE_FIELD:
+                case HDR_PERMISSION_TOKEN:
+                case HDR_TARGET_PATH:
+                case HDR_SOURCE_PATH:
+                    short slen = DSBytes.readShort(in, false);
+                    len -= 2;
+                    val = readString(in, slen);
+                    len -= slen;
+                    break;
+                default:
+                    val = NO_HEADER_VAL;
+            }
+            headers.put(code, val);
+        }
+    }
+
+    /**
+     * Decodes a DSA 2.n string.
+     */
+    public String readString(InputStream in) {
+        int len = DSBytes.readShort(in, false);
+        if (len == 0) {
+            return "";
+        }
+        return readString(in, len);
+    }
+
+    /**
+     * Decodes a DSA 2.n string.
+     */
+    private String readString(InputStream in, int len) {
+        String ret = null;
+        try {
+            ByteBuffer byteBuf = getStringBuffer(len);
+            for (int i = len; --i >= 0; ) {
+                byteBuf.put((byte) in.read());
+            }
+            byteBuf.flip();
+            CharBuffer charBuf = getCharBuffer(len);
+            utf8decoder.decode(byteBuf, charBuf, false);
+            charBuf.flip();
+            ret = charBuf.toString();
+        } catch (IOException x) {
+            DSException.throwRuntime(x);
+        }
+        return ret;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageWriter.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageWriter.java
new file mode 100644
index 00000000..1bd1d6f3
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2MessageWriter.java
@@ -0,0 +1,266 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetEncoder;
+import java.util.HashMap;
+import java.util.Map;
+import org.iot.dsa.node.DSString;
+
+/**
+ * Used to write a DSA 2.n message (header and body).  Call init(int,int) to start a new message,
+ * can be reused for multiple messages. Not thread safe, the intent is messages will be constructed
+ * and written serially.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2MessageWriter extends DS2Message implements MessageWriter {
+
+    // Fields
+    // ------
+
+    private int ackId = -1;
+    private DSByteBuffer body;
+    private CharBuffer charBuffer;
+    private DSByteBuffer header;
+    private Map<Integer, Object> headers = new HashMap<Integer, Object>();
+    private int method;
+    private int requestId = -1;
+    private ByteBuffer strBuffer;
+    private CharsetEncoder utf8encoder;
+    private MsgpackWriter writer;
+
+    // Constructors
+    // ------------
+
+    public DS2MessageWriter() {
+        header = new DSByteBuffer();
+        body = new DSByteBuffer();
+        writer = new MsgpackWriter(body);
+        utf8encoder = DSString.UTF8.newEncoder();
+        init(-1, -1);
+    }
+
+    // Methods
+    // -------
+
+    /**
+     * Encodes the key into the header buffer.
+     */
+    public DS2MessageWriter addHeader(int key) {
+        headers.put(key, NO_HEADER_VAL);
+        header.put((byte) key);
+        return this;
+    }
+
+    /**
+     * Encodes the key value pair into the header buffer.
+     */
+    public DS2MessageWriter addByteHeader(int key, byte value) {
+        headers.put(key, value);
+        header.put((byte) key);
+        header.put(value);
+        return this;
+    }
+
+    /**
+     * Encodes the key value pair into the header buffer.
+     */
+    public DS2MessageWriter addIntHeader(int key, int value) {
+        headers.put(key, value);
+        header.put((byte) key);
+        header.putInt(value, false);
+        return this;
+    }
+
+    /**
+     * Encodes the key value pair into the header buffer.
+     */
+    public DS2MessageWriter addStringHeader(int key, String value) {
+        headers.put(key, value);
+        header.put((byte) key);
+        writeString(value, header);
+        return this;
+    }
+
+
+    private void finishHeader() {
+        int hlen = header.length();
+        int blen = body.length();
+        header.replaceInt(0, hlen + blen, false);
+        header.replaceShort(4, (short) hlen, false);
+        header.replace(6, (byte) (method & 0xFF));
+    }
+
+    public DSByteBuffer getBody() {
+        return body;
+    }
+
+    public int getBodyLength() {
+        return body.length();
+    }
+
+    /**
+     * Attempts to reuse a charbuffer, but will allocate a new one if the size demands
+     * it.
+     */
+    private CharBuffer getCharBuffer(CharSequence arg) {
+        int len = arg.length();
+        if (charBuffer == null) {
+            int tmp = 1024;
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            charBuffer = CharBuffer.allocate(tmp);
+        } else if (charBuffer.length() < len) {
+            int tmp = charBuffer.length();
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            charBuffer = CharBuffer.allocate(tmp);
+        } else {
+            charBuffer.clear();
+        }
+        charBuffer.append(arg);
+        charBuffer.flip();
+        return charBuffer;
+    }
+
+    @Override
+    protected void getDebug(StringBuilder buf) {
+        buf.append("SEND ");
+        debugMethod(method, buf);
+        if (requestId > 0) {
+            buf.append(", ").append("Rid ").append(requestId);
+        }
+        if (ackId > 0) {
+            buf.append(", ").append("Ack ").append(ackId);
+        }
+        debugHeaders(headers, buf);
+    }
+
+    /**
+     * Called by writeString(), returns a bytebuffer for the given capacity ready for writing
+     * (putting).  Attempts to reuse the same buffer as much as possible.
+     */
+    private ByteBuffer getStringBuffer(int len) {
+        if (strBuffer == null) {
+            int tmp = 1024;
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            strBuffer = ByteBuffer.allocate(tmp);
+        } else if (strBuffer.capacity() < len) {
+            int tmp = strBuffer.capacity();
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            strBuffer = ByteBuffer.allocate(tmp);
+        } else {
+            strBuffer.clear();
+        }
+        return strBuffer;
+    }
+
+    @Override
+    public MsgpackWriter getWriter() {
+        return writer;
+    }
+
+    /**
+     * Initialize a new message.
+     *
+     * @param requestId The request ID or -1 to omit.
+     * @param ackId     -1 to omit.
+     */
+    public DS2MessageWriter init(int requestId, int ackId) {
+        this.requestId = requestId;
+        this.ackId = ackId;
+        body.clear();
+        headers.clear();
+        writer.reset();
+        header.clear();
+        header.skip(7);
+        if ((requestId >= 0) || (ackId >= 0)) {
+            if (requestId < 0) {
+                requestId = 0;
+            }
+            header.putInt(requestId, false);
+            if (ackId < 0) {
+                ackId = 0;
+            }
+            header.putInt(ackId, false);
+        }
+        return this;
+    }
+
+    public MultipartWriter makeMultipart() {
+        DSByteBuffer tmp = body;
+        body = new DSByteBuffer();
+        writer = new MsgpackWriter(body);
+        return new MultipartWriter(requestId, method, headers, tmp);
+    }
+
+    public boolean requiresMultipart() {
+        return getBodyLength() > MAX_BODY;
+    }
+
+    public DS2MessageWriter setMethod(int method) {
+        this.method = method;
+        return this;
+    }
+
+    /**
+     * This is for testing, it encodes the full message.
+     */
+    public byte[] toByteArray() {
+        ByteArrayOutputStream out = new ByteArrayOutputStream(header.length() + body.length());
+        finishHeader();
+        header.sendTo(out);
+        body.sendTo(out);
+        return out.toByteArray();
+    }
+
+    /**
+     * Writes the message to the transport.
+     */
+    public DS2MessageWriter write(DSBinaryTransport out) {
+        finishHeader();
+        header.sendTo(out, false);
+        body.sendTo(out, true);
+        if (debug()) {
+            printDebug();
+        }
+        return this;
+    }
+
+    /**
+     * DSA 2.n encodes a string into the body.
+     */
+    public void writeString(CharSequence str) {
+        CharBuffer chars = getCharBuffer(str);
+        ByteBuffer strBuffer = getStringBuffer(
+                chars.position() * (int) utf8encoder.maxBytesPerChar());
+        utf8encoder.encode(chars, strBuffer, false);
+        body.putShort((short) strBuffer.position(), false);
+        body.put(strBuffer);
+    }
+
+    /**
+     * DSA 2.n encodes a string into the the given buffer.
+     */
+    public void writeString(CharSequence str, DSByteBuffer buf) {
+        CharBuffer chars = getCharBuffer(str);
+        ByteBuffer strBuffer = getStringBuffer(
+                chars.position() * (int) utf8encoder.maxBytesPerChar());
+        utf8encoder.encode(chars, strBuffer, false);
+        buf.putShort((short) strBuffer.position(), false);
+        buf.put(strBuffer);
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Session.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Session.java
new file mode 100644
index 00000000..88d813af
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/DS2Session.java
@@ -0,0 +1,233 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.protocol.v2.requester.DS2Requester;
+import com.acuity.iot.dsa.dslink.protocol.v2.responder.DS2Responder;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.util.HashMap;
+import java.util.Map;
+import org.iot.dsa.dslink.DSIRequester;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSInt;
+
+/**
+ * Implements DSA 1.1.2
+ *
+ * @author Aaron Hansen
+ */
+public class DS2Session extends DSSession implements MessageConstants {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    static final int END_MSG_THRESHOLD = 48 * 1024;
+    static final String LAST_ACK_RECV = "Last Ack Recv";
+    static final int MAX_MSG_IVL = 45000;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSInfo lastAckRecv = getInfo(LAST_ACK_RECV);
+    private long lastMessageSent;
+    private DS2MessageReader messageReader;
+    private DS2MessageWriter messageWriter;
+    private Map<Integer, MultipartReader> multiparts = new HashMap<Integer, MultipartReader>();
+    private boolean requestsNext = false;
+    private DS2Requester requester = new DS2Requester(this);
+    private DS2Responder responder = new DS2Responder(this);
+
+    /////////////////////////////////////////////////////////////////
+    // Constructors
+    /////////////////////////////////////////////////////////////////
+
+    public DS2Session() {
+    }
+
+    public DS2Session(DS2LinkConnection connection) {
+        super(connection);
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Methods
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void declareDefaults() {
+        declareDefault(LAST_ACK_RECV, DSInt.NULL).setReadOnly(true);
+    }
+
+    @Override
+    protected void doRecvMessage() {
+        DSBinaryTransport transport = getTransport();
+        DS2MessageReader reader = getMessageReader();
+        transport.beginRecvMessage();
+        reader.init(transport.getInput());
+        int ack = reader.getAckId();
+        if (ack > 0) {
+            put(lastAckRecv, DSInt.valueOf(ack));
+        }
+        if (reader.isMultipart()) {
+            MultipartReader multi = multiparts.get(reader.getRequestId());
+            if (multi == null) {
+                multi = new MultipartReader(reader);
+                multiparts.put(reader.getRequestId(), multi);
+                return;
+            } else if (multi.update(reader)) {
+                return;
+            }
+            multiparts.remove(reader.getRequestId());
+            reader = multi.makeReader();
+        }
+        if (reader.isRequest()) {
+            responder.handleRequest(reader);
+            setNextAck(reader.getRequestId());
+        } else if (reader.isAck()) {
+            put(lastAckRecv, DSInt.valueOf(DSBytes.readInt(reader.getBody(), false)));
+        } else if (reader.isPing()) {
+            ;
+        } else if (reader.isResponse()) {
+            requester.handleResponse(reader);
+            setNextAck(reader.getRequestId());
+        } else {
+            error("Unknown method: " + reader.getMethod());
+        }
+        transport.endRecvMessage();
+    }
+
+    @Override
+    protected void doSendMessage() {
+        DSTransport transport = getTransport();
+        if (this.hasSomethingToSend()) {
+            transport.beginSendMessage();
+            send(requestsNext = !requestsNext);  //alternate reqs and resps
+            transport.endSendMessage();
+        }
+    }
+
+    @Override
+    public DS2LinkConnection getConnection() {
+        return (DS2LinkConnection) super.getConnection();
+    }
+
+    private DS2MessageReader getMessageReader() {
+        if (messageReader == null) {
+            messageReader = new DS2MessageReader();
+        }
+        return messageReader;
+    }
+
+    private DS2MessageWriter getMessageWriter() {
+        if (messageWriter == null) {
+            messageWriter = new DS2MessageWriter();
+        }
+        return messageWriter;
+    }
+
+    @Override
+    public DSIRequester getRequester() {
+        return requester;
+    }
+
+    public DSBinaryTransport getTransport() {
+        return (DSBinaryTransport) super.getTransport();
+    }
+
+    private boolean hasPingToSend() {
+        return (System.currentTimeMillis() - lastMessageSent) > MAX_MSG_IVL;
+    }
+
+    /**
+     * Override point, returns true if there are any pending acks or outbound messages queued up.
+     */
+    protected boolean hasSomethingToSend() {
+        if (hasPingToSend()) {
+            return true;
+        }
+        return super.hasSomethingToSend();
+    }
+
+    /*
+    @Override
+    protected void onStable() {
+        put("Requester Session", requesterSession);
+        put("Responder Session", responderSession);
+    }
+    */
+
+    @Override
+    public void onConnect() {
+        super.onConnect();
+        messageReader = null;
+        messageWriter = null;
+        requester.onConnect();
+        responder.onConnect();
+    }
+
+    @Override
+    public void onConnectFail() {
+        super.onConnectFail();
+        messageReader = null;
+        messageWriter = null;
+        multiparts.clear();
+        requester.onConnectFail();
+        responder.onConnectFail();
+    }
+
+    @Override
+    public void onDisconnect() {
+        super.onDisconnect();
+        messageReader = null;
+        messageWriter = null;
+        multiparts.clear();
+        requester.onDisconnect();
+        responder.onDisconnect();
+    }
+
+    /**
+     * Send messages from one of the queues.
+     *
+     * @param requests Determines which queue to use; True for outgoing requests, false for
+     *                 responses.
+     */
+    private void send(boolean requests) {
+        boolean hasSomething = false;
+        if (requests) {
+            hasSomething = hasOutgoingRequests();
+        } else {
+            hasSomething = hasOutgoingResponses();
+        }
+        OutboundMessage msg = null;
+        if (hasSomething) {
+            if (requests) {
+                msg = dequeueOutgoingRequest();
+            } else {
+                msg = dequeueOutgoingResponse();
+            }
+        } else if (hasPingToSend()) {
+            msg = new PingMessage(this);
+        } else if (hasAckToSend()) {
+            msg = new AckMessage(this);
+        }
+        if (msg != null) {
+            lastMessageSent = System.currentTimeMillis();
+            DS2MessageWriter out = getMessageWriter();
+            msg.write(out);
+        }
+    }
+
+    /**
+     * Returns true if the current message size has crossed a message size threshold.
+     */
+    public boolean shouldEndMessage() {
+        if (getMessageWriter().getBodyLength() > END_MSG_THRESHOLD) {
+            return true;
+        }
+        return (System.currentTimeMillis() - lastMessageSent) > 1000;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MessageConstants.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MessageConstants.java
new file mode 100644
index 00000000..8eb556fe
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MessageConstants.java
@@ -0,0 +1,68 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+/**
+ * Used to write a DSA 2.n message (header and body).  Call init(int,int) to start a new message,
+ * can be reused for multiple messages. Not thread safe, the intent is messages will be constructed
+ * and written serially.
+ *
+ * @author Aaron Hansen
+ */
+public interface MessageConstants {
+
+    int MAX_BODY = 1024 * 48;
+    int MAX_HEADER = 16320;
+    Object NO_HEADER_VAL = new Object();
+
+    int HDR_STATUS = 0x0;
+    int HDR_SEQ_ID = 0x01;
+    int HDR_PAGE_ID = 0x02;
+    int HDR_AUDIT = 0x04;
+    int HDR_ERROR_DETAIL = 0x05;
+    int HDR_ALIAS_COUNT = 0x08;
+    int HDR_PRIORITY = 0x10;
+    int HDR_NO_STREAM = 0x11;
+    int HDR_QOS = 0x12;
+    int HDR_QUEUE_SIZE = 0x14;
+    int HDR_QUEUE_DURATION = 0x15;
+    int HDR_REFRESHED = 0x20;
+    int HDR_PUB_PATH = 0x21;
+    int HDR_SKIPPABLE = 0x30;
+    int HDR_MAX_PERMISSION = 0x32;
+    int HDR_ATTRIBUTE_FIELD = 0x41;
+    int HDR_PERMISSION_TOKEN = 0x60;
+    int HDR_TARGET_PATH = 0x80;
+    int HDR_SOURCE_PATH = 0x81;
+
+    int MSG_SUBSCRIBE_REQ = 0x01;
+    int MSG_SUBSCRIBE_RES = 0x81;
+    int MSG_LIST_REQ = 0x02;
+    int MSG_LIST_RES = 0x82;
+    int MSG_INVOKE_REQ = 0x03;
+    int MSG_INVOKE_RES = 0x83;
+    int MSG_SET_REQ = 0x04;
+    int MSG_SET_RES = 0x84;
+    int MSG_OBSERVE_REQ = 0x0A;
+    int MSG_CLOSE = 0x0F;
+    int MSG_ACK = 0xF8;
+    int MSG_PING = 0xF9;
+    int MSG_HANDSHAKE_1 = 0xF0;
+    int MSG_HANDSHAKE_2 = 0xF1;
+    int MSG_HANDSHAKE_3 = 0xF2;
+    int MSG_HANDSHAKE_4 = 0xF3;
+
+    byte STS_OK = 0;
+    byte STS_INITIALIZING = 0x01;
+    byte STS_NOT_AVAILABLE = 0x0E;
+    byte STS_DROPPED = 0x10;
+    byte STS_CLOSED = 0x20;
+    byte STS_DISCONNECTED = 0x2E;
+    byte STS_PERMISSION_DENIED = 0x40;
+    byte STS_NOT_SUPPORTED = 0x41;
+    byte STS_INVALID_MESSAGE = 0x44;
+    byte STS_INVALID_PARAMETER = 0x45;
+    byte STS_BUSY = 0x48;
+    byte STS_INTERNAL_ERR = 0x50;
+    byte STS_ALIAS_LOOP = 0x61;
+    byte STS_INVALID_AUTH = (byte) 0xF9;
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MultipartReader.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MultipartReader.java
new file mode 100644
index 00000000..91e53acb
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MultipartReader.java
@@ -0,0 +1,79 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Used to combine multiple inbound messages into one when the body of the entire message exceeds
+ * the max possible size.
+ *
+ * @author Aaron Hansen
+ */
+public class MultipartReader implements MessageConstants {
+
+    // Fields
+    // ------
+
+    private DSByteBuffer body = new DSByteBuffer();
+    private int currentPage = 0;
+    private Map<Integer, Object> headers = new HashMap<Integer, Object>();
+    private int lastPage;
+    private int method;
+    private int requestId = -1;
+    private Byte status;
+
+    // Constructors
+    // ------------
+
+    MultipartReader(DS2MessageReader reader) {
+        this.requestId = reader.getRequestId();
+        this.method = reader.getMethod();
+        this.headers.putAll(reader.getHeaders());
+        int page = (Integer) headers.get(HDR_PAGE_ID);
+        if (page >= 0) {
+            throw new IllegalArgumentException("Invalid page id: " + page);
+        }
+        page = -page;
+        lastPage = page - 1;
+    }
+
+    // Methods
+    // -------
+
+    /**
+     * Call this once update returns false.
+     */
+    public DS2MessageReader makeReader() {
+        DS2MessageReader reader = new DS2MessageReader();
+        reader.init(requestId, method, body, headers);
+        return reader;
+    }
+
+    private MultipartReader putBody(InputStream in, int len) {
+        body.put(in, len);
+        return this;
+    }
+
+    private MultipartReader putHeaders(Map<Integer, Object> headers) {
+        this.headers.putAll(headers);
+        status = (Byte) this.headers.get(HDR_STATUS);
+        return this;
+    }
+
+    /**
+     * Call for each part, will return true when there are more parts expected.
+     */
+    public boolean update(DS2MessageReader reader) {
+        int page = (Integer) headers.get(HDR_PAGE_ID);
+        if (page < currentPage) {
+            throw new IllegalStateException("Out of order page");
+        }
+        currentPage = page;
+        putHeaders(reader.getHeaders());
+        putBody(reader.getBody(), reader.getBodyLength());
+        return currentPage < lastPage;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MultipartWriter.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MultipartWriter.java
new file mode 100644
index 00000000..37d2f883
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/MultipartWriter.java
@@ -0,0 +1,89 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Used to write multipart outbound messages when the body of a single message is larger than
+ * the max possible body size.
+ *
+ * @author Aaron Hansen
+ */
+public class MultipartWriter implements MessageConstants {
+
+    // Fields
+    // ------
+
+    private DSByteBuffer body;
+    private Map<Integer, Object> headers;
+    private int method;
+    private int page = 0;
+    private int requestId = -1;
+    private Byte status;
+
+    // Constructors
+    // ------------
+
+    MultipartWriter(int requestId,
+                    int method,
+                    Map<Integer, Object> headers,
+                    DSByteBuffer body) {
+        this.requestId = requestId;
+        this.method = method;
+        this.headers = headers;
+        this.body = body;
+        status = (Byte) headers.get(HDR_STATUS);
+        if (status != null) {
+            headers.put(HDR_STATUS, STS_OK);
+        }
+        page = -((body.length() / MAX_BODY) + 1);
+    }
+
+    // Methods
+    // -------
+
+    private void writeHeaders(DS2MessageWriter writer) {
+        Object val;
+        Map.Entry<Integer, Object> me;
+        Iterator<Map.Entry<Integer, Object>> it = headers.entrySet().iterator();
+        while (it.hasNext()) {
+            me = it.next();
+            val = me.getValue();
+            if (val == NO_HEADER_VAL) {
+                writer.addHeader(me.getKey());
+            } else if (val instanceof Byte) {
+                writer.addByteHeader(me.getKey(), (Byte) val);
+            } else if (val instanceof Integer) {
+                writer.addIntHeader(me.getKey(), (Integer) val);
+            } else if (val instanceof String) {
+                writer.addStringHeader(me.getKey(), (String) val);
+            }
+        }
+    }
+
+    /**
+     * Call for each part, will return true when there are more part remain.
+     */
+    public boolean update(DS2MessageWriter writer, int ackId) {
+        writer.init(requestId, ackId);
+        writer.setMethod(method);
+        headers.put(HDR_PAGE_ID, Integer.valueOf(page));
+        int len = body.length();
+        if (len < MessageConstants.MAX_BODY) {
+            if (status != null) {
+                headers.put(HDR_STATUS, status);
+            }
+        }
+        writeHeaders(writer);
+        len = Math.min(MAX_BODY, len);
+        body.sendTo(writer.getBody(), len);
+        if (page < 0) {
+            page = 1;
+        } else {
+            page++;
+        }
+        return body.length() > 0;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/PingMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/PingMessage.java
new file mode 100644
index 00000000..e98d3b12
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/PingMessage.java
@@ -0,0 +1,25 @@
+package com.acuity.iot.dsa.dslink.protocol.v2;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+
+/**
+ * @author Aaron Hansen
+ */
+class PingMessage implements MessageConstants, OutboundMessage {
+
+    private DS2Session session;
+
+    public PingMessage(DS2Session session) {
+        this.session = session;
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.init(-1, session.getNextAck());
+        out.setMethod(MSG_PING);
+        out.write(session.getTransport());
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundInvokeStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundInvokeStub.java
new file mode 100644
index 00000000..52edf331
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundInvokeStub.java
@@ -0,0 +1,59 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundInvokeStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.protocol.v2.MultipartWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.dslink.requester.OutboundInvokeHandler;
+import org.iot.dsa.node.DSMap;
+
+public class DS2OutboundInvokeStub extends DSOutboundInvokeStub
+        implements DS2OutboundStub, MessageConstants {
+
+    MultipartWriter multipart;
+
+    protected DS2OutboundInvokeStub(DSRequester requester,
+                                    Integer requestId,
+                                    String path,
+                                    DSMap params,
+                                    OutboundInvokeHandler handler) {
+        super(requester, requestId, path, params, handler);
+    }
+
+    public void handleResponse(DS2MessageReader response) {
+        if (response.getBodyLength() > 0) {
+            handleResponse(response.getBodyReader().getMap());
+        }
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        if (multipart != null) {
+            if (multipart.update(out, getSession().getNextAck())) {
+                getRequester().sendRequest(this);
+            }
+            return;
+        }
+        int ack = getSession().getNextAck();
+        out.init(getRequestId(), ack);
+        out.setMethod(MSG_INVOKE_REQ);
+        out.addStringHeader(HDR_TARGET_PATH, getPath());
+        DSMap params = getParams();
+        if (params != null) {
+            out.getWriter().value(params);
+        }
+        if (out.requiresMultipart()) {
+            multipart = out.makeMultipart();
+            multipart.update(out, ack);
+            getRequester().sendRequest(this);
+        } else {
+            out.write((DSBinaryTransport) getRequester().getTransport());
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundListStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundListStub.java
new file mode 100644
index 00000000..da7df9df
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundListStub.java
@@ -0,0 +1,89 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackReader;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundListStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.protocol.v2.MultipartWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import java.io.IOException;
+import java.io.InputStream;
+import org.iot.dsa.dslink.requester.OutboundListHandler;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSPath;
+import org.iot.dsa.util.DSException;
+
+public class DS2OutboundListStub extends DSOutboundListStub
+        implements DS2OutboundStub, MessageConstants {
+
+    private MultipartWriter multipart;
+    private byte state = STS_INITIALIZING;
+
+    protected DS2OutboundListStub(DSRequester requester,
+                                  Integer requestId,
+                                  String path,
+                                  OutboundListHandler handler) {
+        super(requester, requestId, path, handler);
+    }
+
+    public void handleResponse(DS2MessageReader response) {
+        OutboundListHandler handler = getHandler();
+        if (state == STS_INITIALIZING) {
+            Byte status = (Byte) response.getHeader(MessageConstants.HDR_STATUS);
+            if (status.byteValue() == STS_OK) {
+                state = STS_OK;
+                getHandler().onInitialized();
+            }
+        }
+        try {
+            MsgpackReader reader = response.getBodyReader();
+            InputStream in = response.getBody();
+            int bodyLen = response.getBodyLength();
+            String name;
+            DSElement value;
+            while (bodyLen > 0) {
+                int len = DSBytes.readShort(in, false);
+                name = reader.readUTF(len);
+                len = DSBytes.readShort(in, false);
+                if (len == 0) {
+                    handler.onRemove(name);
+                } else {
+                    bodyLen -= len;
+                    reader.reset();
+                    value = reader.getElement();
+                    bodyLen -= len;
+                    handler.onUpdate(DSPath.decodeName(name), value);
+                }
+            }
+        } catch (IOException x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        if (multipart != null) {
+            if (multipart.update(out, getSession().getNextAck())) {
+                getRequester().sendRequest(this);
+            }
+            return;
+        }
+        int ack = getSession().getNextAck();
+        out.init(getRequestId(), ack);
+        out.setMethod(MSG_LIST_REQ);
+        out.addStringHeader(HDR_TARGET_PATH, getPath());
+        if (out.requiresMultipart()) {
+            multipart = out.makeMultipart();
+            multipart.update(out, ack);
+            getRequester().sendRequest(this);
+        } else {
+            out.write((DSBinaryTransport) getRequester().getTransport());
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundRemoveStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundRemoveStub.java
new file mode 100644
index 00000000..62fe9af4
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundRemoveStub.java
@@ -0,0 +1,20 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundRemoveStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import org.iot.dsa.dslink.requester.OutboundRequestHandler;
+
+public class DS2OutboundRemoveStub extends DSOutboundRemoveStub implements DS2OutboundStub {
+
+    protected DS2OutboundRemoveStub(DSRequester requester,
+                                    Integer requestId,
+                                    String path,
+                                    OutboundRequestHandler handler) {
+        super(requester, requestId, path, handler);
+    }
+
+    public void handleResponse(DS2MessageReader response) {
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundSetStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundSetStub.java
new file mode 100644
index 00000000..158698d6
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundSetStub.java
@@ -0,0 +1,67 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundSetStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.protocol.v2.MultipartWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.dslink.requester.OutboundRequestHandler;
+import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSPath;
+
+public class DS2OutboundSetStub extends DSOutboundSetStub
+        implements DS2OutboundStub, MessageConstants {
+
+    private MultipartWriter multipart;
+
+    protected DS2OutboundSetStub(DSRequester requester,
+                                 Integer requestId,
+                                 String path,
+                                 DSIValue value,
+                                 OutboundRequestHandler handler) {
+        super(requester, requestId, path, value, handler);
+    }
+
+    @Override
+    public void handleResponse(DS2MessageReader response) {
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        if (multipart != null) {
+            if (multipart.update(out, getSession().getNextAck())) {
+                getRequester().sendRequest(this);
+            }
+            return;
+        }
+        int ack = getSession().getNextAck();
+        out.init(getRequestId(), ack);
+        out.setMethod(MSG_SET_REQ);
+        String path = getPath();
+        int idx = 1 + path.lastIndexOf('/');
+        if ((idx > 0) && (path.length() > idx)) {
+            if (path.charAt(idx) == '@') {
+                String[] elems = DSPath.decodePath(path);
+                idx = elems.length - 1;
+                String attr = elems[idx];
+                path = DSPath.encodePath(path.charAt(0) == '/', elems, idx);
+                out.addStringHeader(HDR_ATTRIBUTE_FIELD, attr);
+            }
+        }
+        out.addStringHeader(HDR_TARGET_PATH, path);
+        out.getBody().put((byte) 0, (byte) 0);
+        out.getWriter().value(getValue().toElement());
+        if (out.requiresMultipart()) {
+            multipart = out.makeMultipart();
+            multipart.update(out, ack);
+            getRequester().sendRequest(this);
+        } else {
+            out.write((DSBinaryTransport) getRequester().getTransport());
+        }
+
+    }
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundStub.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundStub.java
new file mode 100644
index 00000000..777bcd97
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundStub.java
@@ -0,0 +1,9 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+
+public interface DS2OutboundStub {
+
+    public void handleResponse(DS2MessageReader response);
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundSubscriptions.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundSubscriptions.java
new file mode 100644
index 00000000..97a9b46e
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2OutboundSubscriptions.java
@@ -0,0 +1,68 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundSubscriptions;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2Session;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+
+/**
+ * Manages all subscriptions for a requester.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2OutboundSubscriptions extends DSOutboundSubscriptions implements MessageConstants {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    DS2OutboundSubscriptions(DSRequester requester) {
+        super(requester);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void doBeginSubscribe(MessageWriter writer) {
+    }
+
+    @Override
+    protected void doBeginUnsubscribe(MessageWriter writer) {
+    }
+
+    @Override
+    protected void doEndMessage(MessageWriter writer) {
+    }
+
+    @Override
+    protected void doWriteSubscribe(MessageWriter writer, String path, Integer sid, int qos) {
+        DS2MessageWriter ds2 = (DS2MessageWriter) writer;
+        DS2Session session = (DS2Session) getRequester().getSession();
+        ds2.init(sid, session.getNextAck());
+        ds2.setMethod(MSG_SUBSCRIBE_REQ);
+        ds2.addStringHeader(HDR_TARGET_PATH, path);
+        ds2.addByteHeader(HDR_QOS, (byte) qos);
+        ds2.write((DSBinaryTransport) getRequester().getTransport());
+    }
+
+    /**
+     * Override point for v2.
+     */
+    protected void doWriteUnsubscribe(MessageWriter writer, Integer sid) {
+        requester().sendClose(sid);
+    }
+
+    private DS2Requester requester() {
+        return (DS2Requester) getRequester();
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2Requester.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2Requester.java
new file mode 100644
index 00000000..527ec60f
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/requester/DS2Requester.java
@@ -0,0 +1,217 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.requester;
+
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundInvokeStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundListStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundRemoveStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundSetStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundStub;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSOutboundSubscriptions;
+import com.acuity.iot.dsa.dslink.protocol.requester.DSRequester;
+import com.acuity.iot.dsa.dslink.protocol.v2.CloseMessage;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import java.io.InputStream;
+import org.iot.dsa.dslink.requester.ErrorType;
+import org.iot.dsa.dslink.requester.OutboundInvokeHandler;
+import org.iot.dsa.dslink.requester.OutboundListHandler;
+import org.iot.dsa.dslink.requester.OutboundRequestHandler;
+import org.iot.dsa.io.DSIReader;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSIValue;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.util.DSException;
+
+/**
+ * DSA V1 requester implementation.
+ *
+ * @author Daniel Shapiro, Aaron Hansen
+ */
+public class DS2Requester extends DSRequester implements MessageConstants {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private byte[] buf;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DS2Requester(DSSession session) {
+        super(session);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Received and error, ignoring the body.
+     */
+    private void drain(DS2MessageReader reader) {
+        try {
+            int bufSize = 512;
+            int bodyLen = reader.getBodyLength();
+            if (bodyLen <= 0) {
+                return;
+            }
+            if (buf == null) {
+                buf = new byte[bufSize];
+            }
+            InputStream in = reader.getBody();
+            int len = Math.min(bodyLen, bufSize);
+            while (len > 0) {
+                in.read(buf, 0, len);
+                bodyLen -= len;
+                len = Math.min(bodyLen, bufSize);
+            }
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    private boolean handleError(DS2MessageReader reader, Byte status, DSOutboundStub stub) {
+        if (status == null) {
+            return false;
+        }
+        ErrorType type;
+        String message;
+        switch (status) {
+            case STS_ALIAS_LOOP:
+                type = ErrorType.badRequest;
+                message = "Alias Loop";
+                break;
+            case STS_INTERNAL_ERR:
+                type = ErrorType.internalError;
+                message = "Internal Error";
+                break;
+            case STS_INVALID_AUTH:
+                type = ErrorType.permissionDenied;
+                message = "Invalid Auth Value";
+                break;
+            case STS_INVALID_MESSAGE:
+                type = ErrorType.badRequest;
+                message = "Invalid Message";
+                break;
+            case STS_INVALID_PARAMETER:
+                type = ErrorType.badRequest;
+                message = "Invalid Parameter";
+                break;
+            case STS_NOT_SUPPORTED:
+                type = ErrorType.notSupported;
+                message = "Not Supported";
+                break;
+            case STS_PERMISSION_DENIED:
+                type = ErrorType.permissionDenied;
+                message = "Permission Denied";
+                break;
+            default:
+                return false;
+        }
+        if (type == null) {
+            return false;
+        }
+        drain(reader);
+        String tmp = (String) reader.getHeader(HDR_ERROR_DETAIL);
+        if (tmp != null) {
+            message = tmp;
+        }
+        stub.handleError(type, message);
+        return true;
+    }
+
+
+    public void handleResponse(DS2MessageReader reader) {
+        if (handleSubscription(reader)) {
+            return;
+        }
+        Integer rid = reader.getRequestId();
+        DSOutboundStub stub = getRequest(rid);
+        if (stub == null) {
+            warn(warn() ? "Response for unknown rid: " + rid : null);
+            drain(reader);
+            sendClose(rid);
+            return;
+        }
+        Byte status = (Byte) reader.getHeader(HDR_STATUS);
+        if (handleError(reader, status, stub)) {
+            stub.handleClose();
+            removeRequest(rid);
+            return;
+        }
+        ((DS2OutboundStub) stub).handleResponse(reader);
+        if (isStreamClosed(status)) {
+            stub.handleClose();
+            removeRequest(rid);
+        }
+    }
+
+    private boolean handleSubscription(DS2MessageReader reader) {
+        if (reader.getMethod() != MSG_SUBSCRIBE_RES) {
+            return false;
+        }
+        String ts = null;
+        String sts = null;
+        InputStream in = reader.getBody();
+        DSIReader dsiReader = reader.getBodyReader();
+        int len = DSBytes.readShort(reader.getBody(), false);
+        if (len > 0) {
+            DSMap map = dsiReader.getMap();
+            ts = map.getString("timestamp");
+            sts = map.getString("status");
+            dsiReader.reset();
+        }
+        DSElement value = dsiReader.getElement();
+        getSubscriptions().handleUpdate(reader.getRequestId(), ts, sts, value);
+        return true;
+    }
+
+    private boolean isStreamClosed(Byte status) {
+        if (status == null) {
+            return false;
+        }
+        switch (status) {
+            case STS_BUSY:
+            case STS_CLOSED:
+            case STS_DISCONNECTED:
+                return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected DSOutboundListStub makeList(String path, OutboundListHandler req) {
+        return new DS2OutboundListStub(this, getNextRid(), path, req);
+    }
+
+    @Override
+    protected DSOutboundInvokeStub makeInvoke(String path, DSMap params,
+                                              OutboundInvokeHandler req) {
+        return new DS2OutboundInvokeStub(this, getNextRid(), path, params, req);
+    }
+
+    @Override
+    protected DSOutboundRemoveStub makeRemove(String path, OutboundRequestHandler req) {
+        return new DS2OutboundRemoveStub(this, getNextRid(), path, req);
+    }
+
+    @Override
+    protected DSOutboundSetStub makeSet(String path, DSIValue value, OutboundRequestHandler req) {
+        return new DS2OutboundSetStub(this, getNextRid(), path, value, req);
+    }
+
+    @Override
+    protected DSOutboundSubscriptions makeSubscriptions() {
+        return new DS2OutboundSubscriptions(this);
+    }
+
+    @Override
+    public void sendClose(Integer rid) {
+        removeRequest(rid);
+        sendRequest(new CloseMessage(getSession(), rid));
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundInvoke.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundInvoke.java
new file mode 100644
index 00000000..f020c41d
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundInvoke.java
@@ -0,0 +1,68 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundInvoke;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.protocol.v2.MultipartWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.security.DSPermission;
+
+/**
+ * List implementation for a responder.
+ *
+ * @author Aaron Hansen
+ */
+class DS2InboundInvoke extends DSInboundInvoke implements MessageConstants {
+
+    private int seqId = 0;
+    MultipartWriter multipart;
+
+    DS2InboundInvoke(DSMap parameters, DSPermission permission) {
+        super(parameters, permission);
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        if (multipart != null) {
+            if (multipart.update(out, getSession().getNextAck())) {
+                getResponder().sendResponse(this);
+            }
+            return;
+        }
+        int ack = getSession().getNextAck();
+        out.init(getRequestId(), ack);
+        out.setMethod(MSG_INVOKE_RES);
+        out.addIntHeader(HDR_SEQ_ID, seqId);
+        seqId++;
+        super.write(writer);
+        if (out.requiresMultipart()) {
+            multipart = out.makeMultipart();
+            multipart.update(out, ack);
+            getResponder().sendResponse(this);
+        } else {
+            out.write((DSBinaryTransport) getResponder().getTransport());
+        }
+    }
+
+    @Override
+    protected void writeBegin(MessageWriter writer) {
+        writer.getWriter().beginMap();
+    }
+
+    @Override
+    protected void writeClose(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.addByteHeader(HDR_STATUS, STS_CLOSED);
+    }
+
+    @Override
+    protected void writeOpen(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.addByteHeader(HDR_STATUS, STS_OK);
+    }
+
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundList.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundList.java
new file mode 100644
index 00000000..ae9c5e66
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundList.java
@@ -0,0 +1,138 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundList;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.protocol.v2.MultipartWriter;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSPath;
+
+/**
+ * List implementation for a responder.
+ *
+ * @author Aaron Hansen
+ */
+class DS2InboundList extends DSInboundList implements MessageConstants {
+
+    private MultipartWriter multipart;
+    private int seqId = 0;
+
+    @Override
+    protected void beginMessage(MessageWriter writer) {
+    }
+
+    @Override
+    protected void beginUpdates(MessageWriter writer) {
+    }
+
+    @Override
+    protected void encode(String key, DSElement value, MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        /*
+        if (out.isDebug()) {
+            out.getDebug().append('\n').append(key).append(" : ").append(value);
+        }
+        */
+        DSByteBuffer buf = out.getBody();
+        MsgpackWriter mp = out.getWriter();
+        buf.skip(2);
+        int start = buf.length();
+        mp.writeUTF8(key);
+        int end = buf.length();
+        buf.replaceShort(start - 2, (short) (end - start), false);
+        mp.reset();
+        buf.skip(2);
+        start = buf.length();
+        mp.value(value);
+        end = buf.length();
+        buf.replaceShort(start - 2, (short) (end - start), false);
+    }
+
+    @Override
+    protected void encode(String key, String value, MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        /*
+        if (out.isDebug()) {
+            out.getDebug().append('\n').append(key).append(" : ").append(value);
+        }
+        */
+        DSByteBuffer buf = out.getBody();
+        MsgpackWriter mp = out.getWriter();
+        buf.skip(2);
+        int start = buf.length();
+        mp.writeUTF8(key);
+        int end = buf.length();
+        buf.replaceShort(start - 2, (short) (end - start), false);
+        out.getWriter().reset();
+        buf.skip(2);
+        start = buf.length();
+        out.getWriter().value(value);
+        end = buf.length();
+        buf.replaceShort(start - 2, (short) (end - start), false);
+    }
+
+    @Override
+    protected String encodeName(String name, StringBuilder buf) {
+        buf.setLength(0);
+        if (DSPath.encodeName(name, buf)) {
+            return buf.toString();
+        }
+        return name;
+    }
+
+    @Override
+    protected void encodeUpdate(Update update, MessageWriter writer, StringBuilder buf) {
+        if (update.added) {
+            encodeChild(update.child, writer);
+        } else {
+            DS2MessageWriter out = (DS2MessageWriter) writer;
+            out.writeString(encodeName(update.child.getName(), buf));
+            out.getBody().put((byte) 0, (byte) 0);
+        }
+    }
+
+    @Override
+    protected void endMessage(MessageWriter writer, Boolean streamOpen) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        if (streamOpen == null) {
+            out.addByteHeader(HDR_STATUS, STS_INITIALIZING);
+        } else if (streamOpen) {
+            out.addByteHeader(HDR_STATUS, STS_OK);
+        } else {
+            out.addByteHeader(HDR_STATUS, STS_CLOSED);
+        }
+    }
+
+    @Override
+    protected void endUpdates(MessageWriter writer) {
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        if (multipart != null) {
+            if (multipart.update(out, getSession().getNextAck())) {
+                getResponder().sendResponse(this);
+            }
+            return;
+        }
+        int ack = getSession().getNextAck();
+        out.init(getRequestId(), ack);
+        out.setMethod(MSG_LIST_RES);
+        out.addIntHeader(HDR_SEQ_ID, seqId);
+        seqId++;
+        super.write(writer);
+        if (out.requiresMultipart()) {
+            multipart = out.makeMultipart();
+            multipart.update(out, ack);
+            getResponder().sendResponse(this);
+        } else {
+            out.write((DSBinaryTransport) getResponder().getTransport());
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSet.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSet.java
new file mode 100644
index 00000000..cd49e6cb
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSet.java
@@ -0,0 +1,21 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSet;
+import com.acuity.iot.dsa.dslink.protocol.v2.CloseMessage;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.security.DSPermission;
+
+public class DS2InboundSet extends DSInboundSet implements MessageConstants {
+
+    public DS2InboundSet(DSElement value, DSPermission permission) {
+        super(value, permission);
+    }
+
+    @Override
+    protected void sendClose() {
+        getResponder().sendResponse(
+                new CloseMessage(getSession(), getRequestId(), (byte) MSG_SET_RES));
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSubscription.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSubscription.java
new file mode 100644
index 00000000..adb26490
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSubscription.java
@@ -0,0 +1,53 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscription;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscriptions;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.io.DSIWriter;
+import org.iot.dsa.time.DSTime;
+
+/**
+ * Subscribe implementation for the responder.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2InboundSubscription extends DSInboundSubscription implements MessageConstants {
+
+    private int seqId = 0;
+
+    protected DS2InboundSubscription(DSInboundSubscriptions manager,
+                                     Integer sid, String path, int qos) {
+        super(manager, sid, path, qos);
+    }
+
+    @Override
+    protected void write(Update update, MessageWriter writer, StringBuilder buf) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.init(getSubscriptionId(), getSession().getNextAck());
+        out.setMethod(MSG_SUBSCRIBE_RES);
+        out.addIntHeader(HDR_SEQ_ID, seqId);
+        seqId++;
+        DSIWriter dsiWriter = out.getWriter();
+        DSByteBuffer byteBuffer = out.getBody();
+        byteBuffer.skip(2);
+        int start = byteBuffer.length();
+        dsiWriter.beginMap();
+        buf.setLength(0);
+        DSTime.encode(update.timestamp, true, buf);
+        dsiWriter.key("timestamp").value(buf.toString());
+        if (!update.quality.isOk()) {
+            dsiWriter.key("status").value(update.quality.toElement());
+        }
+        dsiWriter.endMap();
+        int end = byteBuffer.length();
+        byteBuffer.replaceShort(start - 2, (short) (end - start), false);
+        dsiWriter.reset();
+        dsiWriter.value(update.value.toElement());
+        out.write((DSBinaryTransport) getResponder().getTransport());
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSubscriptions.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSubscriptions.java
new file mode 100644
index 00000000..c16eae5b
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2InboundSubscriptions.java
@@ -0,0 +1,51 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscription;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscriptions;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSResponder;
+
+/**
+ * Subscribe implementation for the responder.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2InboundSubscriptions extends DSInboundSubscriptions {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DS2InboundSubscriptions(DSResponder responder) {
+        super(responder);
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected DSInboundSubscription makeSubscription(Integer sid, String path, int qos) {
+        DSInboundSubscription ret = new DS2InboundSubscription(this, sid, path, qos);
+        ret.setResponder(getResponder());
+        ret.setSession(getResponder().getSession());
+        return ret;
+    }
+
+    @Override
+    protected void writeBegin(MessageWriter writer) {
+    }
+
+    @Override
+    protected void writeEnd(MessageWriter writer) {
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2Responder.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2Responder.java
new file mode 100644
index 00000000..d7d6dbd0
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/DS2Responder.java
@@ -0,0 +1,205 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.DSStream;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundRequest;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSet;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscription;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundSubscriptions;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSResponder;
+import com.acuity.iot.dsa.dslink.protocol.v2.CloseMessage;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2Session;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.DSRuntime;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSPath;
+import org.iot.dsa.security.DSPermission;
+
+/**
+ * Implementation for DSA v2.
+ *
+ * @author Aaron Hansen
+ */
+public class DS2Responder extends DSResponder implements MessageConstants {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DS2InboundSubscriptions subscriptions = new DS2InboundSubscriptions(this);
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - Constructors
+    /////////////////////////////////////////////////////////////////
+
+    public DS2Responder(DS2Session session) {
+        super(session);
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    protected DSInboundSubscriptions getSubscriptions() {
+        return subscriptions;
+    }
+
+    public DSBinaryTransport getTransport() {
+        return (DSBinaryTransport) getConnection().getTransport();
+    }
+
+    @Override
+    public boolean isV1() {
+        return false;
+    }
+
+    /**
+     * Process an individual request.
+     */
+    public void handleRequest(DS2MessageReader reader) {
+        switch (reader.getMethod()) {
+            case MSG_CLOSE:
+                processClose(reader);
+                break;
+            case MSG_INVOKE_REQ:
+                processInvoke(reader);
+                break;
+            case MSG_LIST_REQ:
+                processList(reader);
+                break;
+            case MSG_OBSERVE_REQ:
+                break;
+            case MSG_SET_REQ:
+                processSet(reader);
+                break;
+            case MSG_SUBSCRIBE_REQ:
+                processSubscribe(reader);
+                break;
+            default:
+                throw new IllegalArgumentException("Unexpected method: " + reader.getMethod());
+        }
+    }
+
+    public void onConnect() {
+    }
+
+    public void onConnectFail() {
+    }
+
+    /**
+     * Handles an invoke request.
+     */
+    private void processClose(DS2MessageReader msg) {
+        int rid = msg.getRequestId();
+        DSStream stream = getRequests().get(rid);
+        if (stream != null) {
+            stream.onClose(rid);
+        } else {
+            subscriptions.unsubscribe(rid);
+        }
+    }
+
+    /**
+     * Handles an invoke request.
+     */
+    private void processInvoke(DS2MessageReader msg) {
+        int rid = msg.getRequestId();
+        DSMap params = null;
+        if (msg.getBodyLength() > 0) {
+            params = msg.getBodyReader().getMap();
+        }
+        DSPermission perm = DSPermission.CONFIG;
+        Object obj = msg.getHeader(HDR_MAX_PERMISSION);
+        if (obj != null) {
+            perm = DSPermission.valueOf(obj.hashCode());
+        }
+        boolean stream = msg.getHeader(HDR_NO_STREAM) == null;
+        DS2InboundInvoke invokeImpl = new DS2InboundInvoke(params, perm);
+        invokeImpl.setStream(stream)
+                  .setPath((String) msg.getHeader(HDR_TARGET_PATH))
+                  .setSession(getSession())
+                  .setRequestId(rid)
+                  .setResponder(this);
+        putRequest(rid, invokeImpl);
+        DSRuntime.run(invokeImpl);
+    }
+
+    /**
+     * Handles a list request.
+     */
+    private void processList(DS2MessageReader msg) {
+        int rid = msg.getRequestId();
+        String path = (String) msg.getHeader(HDR_TARGET_PATH);
+        boolean stream = msg.getHeader(HDR_NO_STREAM) == null;
+        DS2InboundList listImpl = new DS2InboundList();
+        listImpl.setStream(stream)
+                .setPath(path)
+                .setSession(getSession())
+                .setRequestId(rid)
+                .setResponder(this);
+        putRequest(listImpl.getRequestId(), listImpl);
+        DSRuntime.run(listImpl);
+    }
+
+    /**
+     * Handles a set request.
+     */
+    private void processSet(DS2MessageReader msg) {
+        int rid = msg.getRequestId();
+        DSPermission perm = DSPermission.CONFIG;
+        Object obj = msg.getHeader(HDR_MAX_PERMISSION);
+        if (obj != null) {
+            perm = DSPermission.valueOf(obj.hashCode());
+        }
+        int metaLen = DSBytes.readShort(msg.getBody(), false);
+        if (metaLen > 0) {
+            //what to do with it?
+            msg.getBodyReader().getElement();
+        }
+        DSElement value = msg.getBodyReader().getElement();
+        DSInboundSet setImpl = new DSInboundSet(value, perm);
+        String path = (String) msg.getHeader(HDR_TARGET_PATH);
+        String attr = (String) msg.getHeader(HDR_ATTRIBUTE_FIELD);
+        if ((attr != null) && !attr.isEmpty()) {
+            path = DSPath.concat(path, attr, null).toString();
+        }
+        setImpl.setPath(path)
+               .setSession(getSession())
+               .setRequestId(rid)
+               .setResponder(this);
+        DSRuntime.run(setImpl);
+    }
+
+    /**
+     * Handles a subscribe request.
+     */
+    private void processSubscribe(DS2MessageReader msg) {
+        Integer sid = msg.getRequestId();
+        String path = (String) msg.getHeader(HDR_TARGET_PATH);
+        Number qos = (Number) msg.getHeader(HDR_QOS);
+        if (qos == null) {
+            qos = Integer.valueOf(0);
+        }
+        //Integer queueSize = (Integer) msg.getHeader(MessageConstants.HDR_QUEUE_SIZE);
+        DSInboundSubscription sub = subscriptions.subscribe(sid, path, qos.intValue());
+        if (msg.getHeader(HDR_NO_STREAM) != null) {
+            sub.setCloseAfterUpdate(true);
+        }
+    }
+
+    @Override
+    public void sendClose(int rid) {
+        sendResponse(new CloseMessage(getSession(), rid));
+    }
+
+    @Override
+    public void sendError(DSInboundRequest req, Throwable reason) {
+        sendResponse(new ErrorMessage(req, reason));
+    }
+
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/ErrorMessage.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/ErrorMessage.java
new file mode 100644
index 00000000..85a25d6c
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/protocol/v2/responder/ErrorMessage.java
@@ -0,0 +1,57 @@
+package com.acuity.iot.dsa.dslink.protocol.v2.responder;
+
+import com.acuity.iot.dsa.dslink.protocol.message.MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.message.OutboundMessage;
+import com.acuity.iot.dsa.dslink.protocol.responder.DSInboundRequest;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import com.acuity.iot.dsa.dslink.protocol.v2.MessageConstants;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import org.iot.dsa.dslink.DSInvalidPathException;
+import org.iot.dsa.dslink.DSPermissionException;
+import org.iot.dsa.dslink.DSRequestException;
+import org.iot.dsa.util.DSException;
+
+/**
+ * Responder uses to close streams without errors.
+ *
+ * @author Aaron Hansen
+ */
+class ErrorMessage implements MessageConstants, OutboundMessage {
+
+    private DSInboundRequest req;
+    private Throwable reason;
+
+    public ErrorMessage(DSInboundRequest req, Throwable reason) {
+        this.req = req;
+        this.reason = reason;
+    }
+
+    @Override
+    public void write(MessageWriter writer) {
+        DS2MessageWriter out = (DS2MessageWriter) writer;
+        out.init(req.getRequestId(), req.getSession().getNextAck());
+        if (req instanceof DS2InboundInvoke) {
+            out.setMethod(MSG_INVOKE_RES);
+        } else if (req instanceof DS2InboundList) {
+            out.setMethod(MSG_LIST_RES);
+        } else if (req instanceof DS2InboundSet) {
+            out.setMethod(MSG_SET_RES);
+        } else {
+            out.setMethod(MSG_CLOSE);
+        }
+        if (reason instanceof DSRequestException) {
+            if (reason instanceof DSInvalidPathException) {
+                out.addByteHeader(HDR_STATUS, STS_NOT_AVAILABLE);
+            } else if (reason instanceof DSPermissionException) {
+                out.addByteHeader(HDR_STATUS, STS_PERMISSION_DENIED);
+            } else {
+                out.addByteHeader(HDR_STATUS, STS_INVALID_MESSAGE);
+            }
+        } else {
+            out.addByteHeader(HDR_STATUS, STS_INTERNAL_ERR);
+        }
+        out.addStringHeader(HDR_ERROR_DETAIL, DSException.makeMessage(reason));
+        out.write((DSBinaryTransport) req.getResponder().getTransport());
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestLink.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestLink.java
index 9529fe41..696b0300 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestLink.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestLink.java
@@ -1,66 +1,19 @@
 package com.acuity.iot.dsa.dslink.test;
 
-import com.acuity.iot.dsa.dslink.DSTransport;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1ConnectionInit;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1LinkConnection;
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1Session;
-import java.util.logging.Level;
-import org.iot.dsa.dslink.DSLink;
-import org.iot.dsa.dslink.DSLinkConfig;
-import org.iot.dsa.dslink.DSRootNode;
-import org.iot.dsa.node.DSMap;
+import org.iot.dsa.dslink.DSMainNode;
 
 /**
  * Routes requests and responses back to self.
  *
  * @author Aaron Hansen
  */
-public class TestLink extends DSLink {
+public class TestLink extends V2TestLink {
 
     public TestLink() {
     }
 
-    public TestLink(DSRootNode rootNode) {
-        setSaveEnabled(false);
-        setNodes(rootNode);
-        DSLinkConfig cfg = new DSLinkConfig();
-        cfg.setDslinkJson(new DSMap().put("configs", new DSMap()));
-        cfg.setLinkName("dslink-java-testing");
-        cfg.setRequester(true);
-        cfg.setLogLevel(Level.FINEST);
-        cfg.setConfig(DSLinkConfig.CFG_CONNECTION_TYPE, TestConnection.class.getName());
-        cfg.setConfig(DSLinkConfig.CFG_STABLE_DELAY, 1);
-        init(cfg);
+    public TestLink(DSMainNode mainNode) {
+        super(mainNode);
     }
 
-    public static class TestConnection extends DS1LinkConnection {
-
-        protected DS1ConnectionInit initializeConnection() throws Exception {
-            DS1ConnectionInit init = new DS1ConnectionInit();
-            return init;
-        }
-
-        /**
-         * Looks at the connection initialization response to determine the protocol
-         * implementation.
-         */
-        protected DS1Session makeSession(DS1ConnectionInit init) {
-            DS1Session ret = new DS1Session();
-            ret.setRequesterAllowed();
-            return ret;
-        }
-
-        /**
-         * Looks at the connection initialization response to determine the type of transport then
-         * instantiates the correct type fom the config.
-         */
-        protected DSTransport makeTransport(DS1ConnectionInit init) {
-            TestTransport transport = new TestTransport();
-            transport.setConnection(this);
-            transport.setReadTimeout(getLink().getConfig().getConfig(
-                    DSLinkConfig.CFG_READ_TIMEOUT, 60000));
-            return transport;
-        }
-
-    }
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestTransport.java
index 41766da4..223e56fa 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestTransport.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/TestTransport.java
@@ -1,240 +1,17 @@
 package com.acuity.iot.dsa.dslink.test;
 
-import com.acuity.iot.dsa.dslink.DSTransport;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.Level;
-import org.iot.dsa.dslink.DSLinkConnection;
-import org.iot.dsa.io.DSByteBuffer;
-import org.iot.dsa.io.DSIoException;
-import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.io.json.JsonReader;
-import org.iot.dsa.io.json.JsonWriter;
+import com.acuity.iot.dsa.dslink.transport.BufferedBinaryTransport;
 
 /**
  * Routes requests and responses back to self.
  *
  * @author Aaron Hansen
  */
-public class TestTransport extends DSTransport {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSByteBuffer buffer = new DSByteBuffer();
-    private DSLinkConnection connection;
-    private String connectionUri;
-    private int endMessageThreshold = 32768;
-    private int messageSize;
-    private boolean open = false;
-    private DSIReader reader;
-    private DSIWriter writer;
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    @Override
-    public DSTransport beginMessage() {
-        synchronized (buffer) {
-            while (buffer.available() > 0) {
-                try {
-                    buffer.wait(1000);
-                } catch (Exception ignore) {
-                }
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public DSTransport close() {
-        if (!open) {
-            return this;
-        }
-        open = false;
-        buffer.close();
-        return this;
-    }
-
-    @Override
-    public DSTransport endMessage() {
-        messageSize = 0;
-        return this;
-    }
-
-    @Override
-    public DSLinkConnection getConnection() {
-        return connection;
-    }
-
-    @Override
-    public DSIReader getReader() {
-        if (reader == null) {
-            reader = new JsonReader(new MyInputStream(), "UTF-8");
-        }
-        return reader;
-    }
-
-    @Override
-    public DSIWriter getWriter() {
-        if (writer == null) {
-            writer = new JsonWriter(new MyOutputStream());
-        }
-        return writer;
-    }
-
-    @Override
-    public boolean isOpen() {
-        return open;
-    }
-
-    @Override
-    public DSTransport open() {
-        if (open) {
-            return this;
-        }
-        open = true;
-        buffer.open();
-        return this;
-    }
-
-    /**
-     * Returns the nextRun incoming byte, or -1 when end of stream has been reached.
-     *
-     * @throws DSIoException if there are any issues.
-     */
-    private int read() {
-        synchronized (buffer) {
-            buffer.notify();
-            return buffer.read();
-        }
-    }
-
-    /**
-     * Reads incoming bytes into the given buffer.
-     *
-     * @param buf The buffer into which data is read.
-     * @param off The start offset in the buffer to put data.
-     * @param len The maximum number of bytes to read.
-     * @return The number of bytes read or -1 for end of stream.
-     * @throws DSIoException if there are any issues.
-     */
-    private int read(byte[] buf, int off, int len) {
-        synchronized (buffer) {
-            buffer.notify();
-            return buffer.read(buf, off, len);
-        }
-    }
-
-    @Override
-    public DSTransport setConnection(DSLinkConnection connection) {
-        this.connection = connection;
-        return this;
-    }
-
-    @Override
-    public DSTransport setConnectionUrl(String uri) {
-        this.connectionUri = uri;
-        return this;
-    }
+public class TestTransport extends BufferedBinaryTransport {
 
     @Override
-    public DSTransport setReadTimeout(long millis) {
-        buffer.setTimeout(millis);
-        return this;
-    }
-
-    public boolean shouldEndMessage() {
-        return messageSize > endMessageThreshold;
-    }
-
-    public void write(int b) {
-        try {
-            if (!open) {
-                throw new IOException("Closed " + connectionUri);
-            }
-            messageSize++;
-            buffer.put((byte) b);
-        } catch (IOException x) {
-            connection.getLink().getLogger().log(Level.SEVERE, connectionUri, x);
-            close();
-        }
-    }
-
-    /**
-     * Send the buffer and indicate whether it represents the end of the message.
-     *
-     * @param buf    The bytes to send.
-     * @param len    The number of bytes to send from index 0.
-     * @param isLast Whether or not this completes the message.
-     * @throws DSIoException If there are any issue.
-     */
-    public void write(byte[] buf, int off, int len, boolean isLast) {
-        if (!open) {
-            throw new DSIoException("Closed " + connectionUri);
-        }
-        messageSize += len;
-        buffer.put(buf, 0, len);
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes
-    /////////////////////////////////////////////////////////////////
-
-    private class MyInputStream extends InputStream {
-
-        @Override
-        public int available() {
-            return buffer.available();
-        }
-
-        @Override
-        public void close() {
-            TestTransport.this.close();
-        }
-
-        @Override
-        public int read() throws IOException {
-            return buffer.read();
-        }
-
-        @Override
-        public int read(byte[] buf) throws IOException {
-            return buffer.read(buf, 0, buf.length);
-        }
-
-        @Override
-        public int read(byte[] buf, int off, int len) throws IOException {
-            return buffer.read(buf, off, len);
-        }
-    }
-
-    private class MyOutputStream extends OutputStream {
-
-        @Override
-        public void close() {
-            TestTransport.this.close();
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            TestTransport.this.write(b);
-        }
-
-        @Override
-        public void write(byte[] buf) throws IOException {
-            TestTransport.this.write(buf, 0, buf.length, false);
-        }
-
-        @Override
-        public void write(byte[] buf, int off, int len) throws IOException {
-            TestTransport.this.write(buf, off, len, false);
-        }
-
+    protected void doWrite(byte[] buf, int off, int len, boolean isLast) {
+        receive(buf, off, len);
     }
 
 }
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/V1TestLink.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/V1TestLink.java
new file mode 100644
index 00000000..675f532e
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/V1TestLink.java
@@ -0,0 +1,65 @@
+package com.acuity.iot.dsa.dslink.test;
+
+import com.acuity.iot.dsa.dslink.protocol.v1.DS1ConnectionInit;
+import com.acuity.iot.dsa.dslink.protocol.v1.DS1LinkConnection;
+import com.acuity.iot.dsa.dslink.protocol.v1.DS1Session;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.util.logging.Level;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.dslink.DSLinkConfig;
+import org.iot.dsa.dslink.DSMainNode;
+import org.iot.dsa.node.DSMap;
+
+/**
+ * Routes requests and responses back to self.
+ *
+ * @author Aaron Hansen
+ */
+public class V1TestLink extends DSLink {
+
+    public V1TestLink() {
+    }
+
+    public V1TestLink(DSMainNode MainNode) {
+        setSaveEnabled(false);
+        setNodes(MainNode);
+        DSLinkConfig cfg = new DSLinkConfig();
+        cfg.setDslinkJson(new DSMap().put("configs", new DSMap()));
+        cfg.setLinkName("dslink-java-testing");
+        cfg.setLogLevel(Level.FINEST);
+        cfg.setConfig(DSLinkConfig.CFG_CONNECTION_TYPE, TestConnection.class.getName());
+        cfg.setConfig(DSLinkConfig.CFG_STABLE_DELAY, 1);
+        init(cfg);
+    }
+
+    public static class TestConnection extends DS1LinkConnection {
+
+        protected DS1ConnectionInit initializeConnection() {
+            return new DS1ConnectionInit();
+        }
+
+        /**
+         * Looks at the connection initialization response to determine the protocol
+         * implementation.
+         */
+        protected DS1Session makeSession(DS1ConnectionInit init) {
+            DS1Session ret = new DS1Session(TestConnection.this);
+            ret.setRequesterAllowed();
+            return ret;
+        }
+
+        /**
+         * Looks at the connection initialization response to determine the type of transport then
+         * instantiates the correct type fom the config.
+         */
+        protected DSTransport makeTransport(DS1ConnectionInit init) {
+            TestTransport transport = new TestTransport();
+            transport.setConnection(this);
+            transport.setReadTimeout(getLink().getConfig().getConfig(
+                    DSLinkConfig.CFG_READ_TIMEOUT, 60000));
+            setTransport(transport);
+            return transport;
+        }
+
+    }
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/V2TestLink.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/V2TestLink.java
new file mode 100644
index 00000000..b4ae270f
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/test/V2TestLink.java
@@ -0,0 +1,58 @@
+package com.acuity.iot.dsa.dslink.test;
+
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2LinkConnection;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import java.util.logging.Level;
+import org.iot.dsa.dslink.DSLink;
+import org.iot.dsa.dslink.DSLinkConfig;
+import org.iot.dsa.dslink.DSMainNode;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.time.DSDateTime;
+
+/**
+ * Routes requests and responses back to self.
+ *
+ * @author Aaron Hansen
+ */
+public class V2TestLink extends DSLink {
+
+    public V2TestLink() {
+    }
+
+    public V2TestLink(DSMainNode MainNode) {
+        setSaveEnabled(false);
+        setNodes(MainNode);
+        DSLinkConfig cfg = new DSLinkConfig();
+        cfg.setDslinkJson(new DSMap().put("configs", new DSMap()));
+        cfg.setLinkName("dslink-java-testing");
+        cfg.setLogLevel(Level.FINEST);
+        cfg.setConfig(DSLinkConfig.CFG_CONNECTION_TYPE, TestConnection.class.getName());
+        cfg.setConfig(DSLinkConfig.CFG_STABLE_DELAY, 1);
+        init(cfg);
+    }
+
+    public static class TestConnection extends DS2LinkConnection {
+
+        @Override
+        protected DSBinaryTransport makeTransport() {
+            TestTransport transport = new TestTransport();
+            transport.setConnection(this);
+            transport.setReadTimeout(getLink().getConfig().getConfig(
+                    DSLinkConfig.CFG_READ_TIMEOUT, 60000));
+            return transport;
+        }
+
+        @Override
+        protected void onConnect() {
+            super.onConnect();
+            getSession().setRequesterAllowed();
+        }
+
+        @Override
+        protected void performHandshake() {
+            put(LAST_CONNECT_OK, DSDateTime.currentTime());
+            put(STATUS, DSStatus.ok);
+        }
+    }
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/BufferedBinaryTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/BufferedBinaryTransport.java
new file mode 100644
index 00000000..bf39e6b0
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/BufferedBinaryTransport.java
@@ -0,0 +1,308 @@
+package com.acuity.iot.dsa.dslink.transport;
+
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.io.DSIoException;
+import java.io.InputStream;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.util.DSException;
+
+/**
+ * For binary transports that do not have an InputStream (such as websockets).  Subclasses
+ * should call receive() for incoming bytes.
+ *
+ * @author Aaron Hansen
+ */
+public abstract class BufferedBinaryTransport extends DSBinaryTransport {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final int DEBUG_COLS = 30;
+
+    private RuntimeException closeException;
+    private InputStream input = new MyInputStream();
+    private int messageSize;
+    private boolean open = false;
+    private DSByteBuffer readBuffer = new DSByteBuffer();
+    private StringBuilder traceIn;
+    private int traceInSize = 0;
+    private StringBuilder traceOut;
+    private int traceOutSize = 0;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    public void beginRecvMessage() {
+        if (trace()) {
+            if (traceIn == null) {
+                traceIn = new StringBuilder();
+            }
+            traceInSize = 0;
+            traceIn.append("Recv:\n");
+        }
+    }
+
+    @Override
+    public void beginSendMessage() {
+        if (trace()) {
+            if (traceOut == null) {
+                traceOut = new StringBuilder();
+            }
+            traceOutSize = 0;
+            traceOut.append("Send:\n");
+        }
+    }
+
+    protected void close(Throwable reason) {
+        closeException = DSException.makeRuntime(reason);
+        close();
+    }
+
+    @Override
+    public DSTransport close() {
+        synchronized (this) {
+            if (!open) {
+                return this;
+            }
+            open = false;
+            notifyAll();
+        }
+        return this;
+    }
+
+    /**
+     * Called by the write method.
+     */
+    protected abstract void doWrite(byte[] buf, int off, int len, boolean isLast);
+
+    @Override
+    public void endRecvMessage() {
+        if (trace()) {
+            if (traceIn != null) {
+                if (traceIn.length() > 6) {
+                    trace(traceIn.toString());
+                }
+                traceIn.setLength(0);
+            }
+        } else if (traceIn != null) {
+            traceIn = null;
+        }
+    }
+
+    @Override
+    public void endSendMessage() {
+        if (trace()) {
+            if (traceOut != null) {
+                if (traceOut.length() > 6) {
+                    trace(traceOut.toString());
+                }
+                traceOut.setLength(0);
+            }
+        } else if (traceOut != null) {
+            traceOut = null;
+        }
+    }
+
+    @Override
+    public InputStream getInput() {
+        return input;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return open;
+    }
+
+    @Override
+    public int messageSize() {
+        return messageSize;
+    }
+
+    /**
+     * Overrides must call super to set the open state.
+     */
+    public DSTransport open() {
+        open = true;
+        return this;
+    }
+
+    /**
+     * Call this for all incoming bytes.
+     */
+    protected void receive(byte[] bytes, int off, int len) {
+        if (!testOpen()) {
+            throw new IllegalStateException("Transport closed");
+        }
+        synchronized (this) {
+            readBuffer.put(bytes, 0, len);
+            notifyAll();
+        }
+    }
+
+    /**
+     * Returns true if open, false if closed, throws and exception if closed with an exception.
+     */
+    protected boolean testOpen() {
+        if (!open) {
+            if (closeException != null) {
+                throw closeException;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Handles logging and calls doWrite.
+     */
+    public final void write(byte[] buf, int off, int len, boolean isLast) {
+        if (trace()) {
+            for (int i = off, j = off + len; i < j; i++) {
+                if (traceOutSize > 0) {
+                    traceOut.append(' ');
+                }
+                DSBytes.toHex(buf[i], traceOut);
+                if (++traceOutSize == DEBUG_COLS) {
+                    traceOutSize = 0;
+                    traceOut.append('\n');
+                }
+            }
+        }
+        if (isLast) {
+            messageSize = 0;
+        } else {
+            messageSize += len;
+        }
+        doWrite(buf, off, len, isLast);
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Inner Classes
+    /////////////////////////////////////////////////////////////////
+
+    private class MyInputStream extends InputStream {
+
+        @Override
+        public int available() {
+            return readBuffer.available();
+        }
+
+        @Override
+        public void close() {
+            BufferedBinaryTransport.this.close();
+        }
+
+        @Override
+        public int read() {
+            synchronized (BufferedBinaryTransport.this) {
+                if (testOpen() && readBuffer.available() == 0) {
+                    try {
+                        BufferedBinaryTransport.this.wait(getReadTimeout());
+                    } catch (Exception x) {
+                    }
+                }
+                if (!testOpen()) {
+                    return -1;
+                }
+                if (readBuffer.available() == 0) {
+                    throw new DSIoException("Read timeout");
+                }
+                int ch = readBuffer.read();
+                if (ch == -1) {
+                    return ch;
+                }
+                if (trace()) {
+                    if (traceInSize > 0) {
+                        traceIn.append(' ');
+                    }
+                    DSBytes.toHex((byte) ch, traceIn);
+                    if (++traceInSize == DEBUG_COLS) {
+                        traceInSize = 0;
+                        traceIn.append('\n');
+                    }
+                }
+                return ch;
+            }
+        }
+
+        @Override
+        public int read(byte[] buf) {
+            if (buf.length == 0) {
+                if (!testOpen()) {
+                    return -1;
+                }
+                return 0;
+            }
+            synchronized (BufferedBinaryTransport.this) {
+                if (testOpen() && readBuffer.available() == 0) {
+                    try {
+                        BufferedBinaryTransport.this.wait(getReadTimeout());
+                    } catch (Exception x) {
+                    }
+                }
+                if (!testOpen()) {
+                    return -1;
+                }
+                if (readBuffer.available() == 0) {
+                    throw new DSIoException("Read timeout");
+                }
+                int ret = readBuffer.sendTo(buf, 0, buf.length);
+                if (trace() && (ret > 0)) {
+                    for (int i = 0; i < ret; i++) {
+                        if (traceInSize > 0) {
+                            traceIn.append(' ');
+                        }
+                        DSBytes.toHex(buf[i], traceIn);
+                        if (++traceInSize == DEBUG_COLS) {
+                            traceInSize = 0;
+                            traceIn.append('\n');
+                        }
+                    }
+                }
+                return ret;
+            }
+        }
+
+        @Override
+        public int read(byte[] buf, int off, int len) {
+            if (len == 0) {
+                if (!testOpen()) {
+                    return -1;
+                }
+                return 0;
+            }
+            synchronized (BufferedBinaryTransport.this) {
+                if (testOpen() && readBuffer.available() == 0) {
+                    try {
+                        BufferedBinaryTransport.this.wait(getReadTimeout());
+                    } catch (Exception x) {
+                    }
+                }
+                if (!testOpen()) {
+                    return -1;
+                }
+                if (readBuffer.available() == 0) {
+                    throw new DSIoException("Read timeout");
+                }
+                int ret = readBuffer.sendTo(buf, off, len);
+                if (trace() && (ret > 0)) {
+                    for (int i = 0; i < ret; i++) {
+                        if (traceInSize > 0) {
+                            traceIn.append(' ');
+                        }
+                        DSBytes.toHex(buf[i], traceIn);
+                        if (++traceInSize == DEBUG_COLS) {
+                            traceInSize = 0;
+                            traceIn.append('\n');
+                        }
+                    }
+                }
+                return ret;
+            }
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSBinaryTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSBinaryTransport.java
new file mode 100644
index 00000000..492a84d8
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSBinaryTransport.java
@@ -0,0 +1,29 @@
+package com.acuity.iot.dsa.dslink.transport;
+
+import java.io.InputStream;
+
+/**
+ * Transport that reads and writes binary data.
+ *
+ * @author Aaron Hansen
+ */
+public abstract class DSBinaryTransport extends DSTransport {
+
+    /**
+     * For reading raw bytes from the underlying transport.  The DSK does not care about frame
+     * oriented transports.
+     */
+    public abstract InputStream getInput();
+
+    /**
+     * Writes bytes to the underlying transport.
+     *
+     * @param buf    The buffer containing the bytes to write.
+     * @param off    The index in the buffer of the first byte to write.
+     * @param len    The number of bytes to write.
+     * @param isLast Indicator of end of frame (message) for frame oriented transports such as
+     *               websockets.
+     */
+    public abstract void write(byte[] buf, int off, int len, boolean isLast);
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTextTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTextTransport.java
new file mode 100644
index 00000000..e8fc4208
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTextTransport.java
@@ -0,0 +1,17 @@
+package com.acuity.iot.dsa.dslink.transport;
+
+import java.io.Reader;
+import java.io.Writer;
+
+/**
+ * Transport that reads and writes text.
+ *
+ * @author Aaron Hansen
+ */
+public abstract class DSTextTransport extends DSTransport {
+
+    public abstract Reader getReader();
+
+    public abstract Writer getWriter();
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTransport.java
similarity index 68%
rename from dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSTransport.java
rename to dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTransport.java
index 439aa91d..b46d228b 100644
--- a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/DSTransport.java
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/DSTransport.java
@@ -1,11 +1,7 @@
-package com.acuity.iot.dsa.dslink;
+package com.acuity.iot.dsa.dslink.transport;
 
-import java.util.logging.Logger;
 import org.iot.dsa.dslink.DSLinkConnection;
-import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIWriter;
 import org.iot.dsa.node.DSLong;
-import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSString;
 
@@ -28,22 +24,25 @@ public abstract class DSTransport extends DSNode {
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private Logger logger;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
+    private DSLinkConnection connection;
 
     ///////////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    /**
+     * Called at the start of a new inbound message.
+     *
+     * @return This
+     */
+    public abstract void beginRecvMessage();
+
     /**
      * Called at the start of a new outbound message.
      *
      * @return This
      */
-    public abstract DSTransport beginMessage();
+    public abstract void beginSendMessage();
 
     /**
      * Close the actual connection and clean up resources.  Calling when already closed will have no
@@ -60,36 +59,40 @@ protected void declareDefaults() {
     }
 
     /**
-     * Signifies the end of an outgoing message. Needed because websockets are frame based.
-     *
-     * @return This
+     * Signifies the end of an incoming message.
+     */
+    public abstract void endRecvMessage();
+
+    /**
+     * Signifies the end of an outgoing message.
      */
-    public abstract DSTransport endMessage();
+    public abstract void endSendMessage();
 
-    public abstract DSLinkConnection getConnection();
+    public DSLinkConnection getConnection() {
+        return connection;
+    }
 
     public String getConnectionUrl() {
         return String.valueOf(get(CONNECTION_URL));
     }
 
     @Override
-    public Logger getLogger() {
-        if (logger == null) {
-            logger = Logger.getLogger(getConnection().getLink().getLinkName() + ".transport");
-        }
-        return logger;
+    protected String getLogName() {
+        return getClass().getSimpleName();
     }
 
+
     public long getReadTimeout() {
         return ((DSLong) get(READ_TIMEOUT)).toLong();
     }
 
-    public abstract DSIReader getReader();
-
-    public abstract DSIWriter getWriter();
-
     public abstract boolean isOpen();
 
+    /**
+     * The size of the current message (in what depends on the type of transport).
+     */
+    public abstract int messageSize();
+
     /**
      * Establish the underlying connection.  Calling when already open will have no effect.
      *
@@ -100,7 +103,10 @@ public long getReadTimeout() {
     /**
      * @return This
      */
-    public abstract DSTransport setConnection(DSLinkConnection connection);
+    public DSTransport setConnection(DSLinkConnection connection) {
+        this.connection = connection;
+        return this;
+    }
 
     /**
      * The complete url used to establish the connection.
@@ -123,25 +129,21 @@ public DSTransport setReadTimeout(long millis) {
         return this;
     }
 
-    /**
-     * Whether or not to continue the current message.  Implementations might have a limit on
-     * message size, this should return true before the limit is reached.
-     */
-    public abstract boolean shouldEndMessage();
-
     /////////////////////////////////////////////////////////////////
     // Inner Classes
     /////////////////////////////////////////////////////////////////
 
     /**
      * Responsible for creating the appropriate transport.  When launching a link, the config
-     * transportFactory needs to be set to an implementation of this.  The implmentation must
+     * wsTransportFactory needs to be set to an implementation of this.  The implementation must
      * support the public no-arg constructor.
      */
     public interface Factory {
 
-        public DSTransport makeTransport(DSMap connectionInitializationResponse);
+        public DSBinaryTransport makeBinaryTransport(DSLinkConnection conn);
+
+        public DSTextTransport makeTextTransport(DSLinkConnection conn);
 
     }
 
-} //class
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/SocketTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/SocketTransport.java
new file mode 100644
index 00000000..d68cb0c2
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/SocketTransport.java
@@ -0,0 +1,86 @@
+package com.acuity.iot.dsa.dslink.transport;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.URI;
+import javax.net.ssl.SSLSocketFactory;
+import org.iot.dsa.util.DSException;
+
+/**
+ * Plain old socket DSTransport.
+ *
+ * @author Aaron Hansen
+ */
+public class SocketTransport extends StreamBinaryTransport {
+
+    private InputStream in;
+    private OutputStream out;
+    private Socket socket;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void doClose() {
+        try {
+            if (in != null) {
+                in.close();
+            }
+        } catch (Exception x) {
+            trace(getConnection().getConnectionId(), x);
+        }
+        try {
+            if (out != null) {
+                out.close();
+            }
+        } catch (Exception x) {
+            trace(getConnection().getConnectionId(), x);
+        }
+        try {
+            if (socket != null) {
+                socket.close();
+            }
+        } catch (Exception x) {
+            trace(getConnection().getConnectionId(), x);
+        }
+        in = null;
+        out = null;
+        socket = null;
+    }
+
+    @Override
+    public DSTransport open() {
+        if (isOpen()) {
+            throw new IllegalStateException("Already open");
+        }
+        try {
+            String url = getConnectionUrl();
+            URI uri = new URI(url);
+            String scheme = uri.getScheme();
+            String host = uri.getHost();
+            int port = uri.getPort();
+            if ("dss".equals(scheme)) {
+                if (port < 0) {
+                    port = 4128;
+                }
+                socket = SSLSocketFactory.getDefault().createSocket(host, port);
+            } else if ("ds".equals(scheme)) {
+                if (port < 0) {
+                    port = 4120;
+                }
+                socket = new Socket(host, port);
+            } else {
+                throw new IllegalArgumentException("Invalid broker URI: " + url);
+            }
+            socket.setSoTimeout((int) getReadTimeout());
+            init(socket.getInputStream(), socket.getOutputStream());
+            fine(fine() ? "SocketTransport open" : null);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        return this;
+    }
+
+}
diff --git a/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/StreamBinaryTransport.java b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/StreamBinaryTransport.java
new file mode 100644
index 00000000..c36efec8
--- /dev/null
+++ b/dslink-core/src/main/java/com/acuity/iot/dsa/dslink/transport/StreamBinaryTransport.java
@@ -0,0 +1,260 @@
+package com.acuity.iot.dsa.dslink.transport;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.iot.dsa.node.DSBytes;
+import org.iot.dsa.util.DSException;
+
+/**
+ * For stream based binary transports.  Subclasses must call init(InputStream,OutputStream).
+ *
+ * @author Aaron Hansen
+ */
+public abstract class StreamBinaryTransport extends DSBinaryTransport {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final int DEBUG_COLS = 30;
+
+    private RuntimeException closeException;
+    private InputStream innerIn;
+    private OutputStream innerOut;
+    private int messageSize;
+    private boolean open = false;
+    private InputStream outerIn = new MyInputStream();
+    private StringBuilder traceIn;
+    private int traceInSize = 0;
+    private StringBuilder traceOut;
+    private int traceOutSize = 0;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    public void beginRecvMessage() {
+        if (trace()) {
+            if (traceIn == null) {
+                traceIn = new StringBuilder();
+            }
+            traceInSize = 0;
+            traceIn.append("Recv:\n");
+        }
+    }
+
+    @Override
+    public void beginSendMessage() {
+        if (trace()) {
+            if (traceOut == null) {
+                traceOut = new StringBuilder();
+            }
+            traceOutSize = 0;
+            traceOut.append("Send:\n");
+        }
+    }
+
+    protected final void close(Throwable reason) {
+        closeException = DSException.makeRuntime(reason);
+        close();
+    }
+
+    @Override
+    public final DSTransport close() {
+        synchronized (this) {
+            if (!open) {
+                return this;
+            }
+            open = false;
+            notifyAll();
+        }
+        doClose();
+        return this;
+    }
+
+    /**
+     * Subclass to perform any cleanup, this does nothing.
+     */
+    protected void doClose() {
+    }
+
+    @Override
+    public void endRecvMessage() {
+        if (trace()) {
+            if (traceIn != null) {
+                if (traceIn.length() > 6) {
+                    trace(traceIn.toString());
+                }
+                traceIn.setLength(0);
+            }
+        } else if (traceIn != null) {
+            traceIn = null;
+        }
+    }
+
+    @Override
+    public void endSendMessage() {
+        if (trace()) {
+            if (traceOut != null) {
+                if (traceOut.length() > 6) {
+                    trace(traceOut.toString());
+                }
+                traceOut.setLength(0);
+            }
+        } else if (traceOut != null) {
+            traceOut = null;
+        }
+    }
+
+    @Override
+    public InputStream getInput() {
+        if (trace()) {
+            return outerIn;
+        }
+        return innerIn;
+    }
+
+    /**
+     * Must be called by the open() implementation.
+     */
+    public void init(InputStream in, OutputStream out) {
+        this.innerIn = in;
+        this.innerOut = out;
+        open = true;
+    }
+
+    @Override
+    public boolean isOpen() {
+        return open;
+    }
+
+    @Override
+    public int messageSize() {
+        return messageSize;
+    }
+
+    /**
+     * Returns true if open, false if closed, throws and exception if closed with an exception.
+     */
+    protected boolean testOpen() {
+        if (!open) {
+            if (closeException != null) {
+                throw closeException;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Handles logging and calls doWrite.
+     */
+    public void write(byte[] buf, int off, int len, boolean isLast) {
+        if (trace()) {
+            for (int i = off, j = off + len; i < j; i++) {
+                if (traceOutSize > 0) {
+                    traceOut.append(' ');
+                }
+                DSBytes.toHex(buf[i], traceOut);
+                if (++traceOutSize == DEBUG_COLS) {
+                    traceOutSize = 0;
+                    traceOut.append('\n');
+                }
+            }
+        }
+        if (isLast) {
+            messageSize = 0;
+        } else {
+            messageSize += len;
+        }
+        try {
+            innerOut.write(buf, off, len);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    /////////////////////////////////////////////////////////////////
+    // Inner Classes
+    /////////////////////////////////////////////////////////////////
+
+    private class MyInputStream extends InputStream {
+
+        @Override
+        public int available() throws IOException {
+            return innerIn.available();
+        }
+
+        @Override
+        public void close() {
+            StreamBinaryTransport.this.close();
+        }
+
+        @Override
+        public int read() throws IOException {
+            if (!testOpen()) {
+                return -1;
+            }
+            int ch = innerIn.read();
+            if (ch == -1) {
+                return ch;
+            }
+            if (trace()) {
+                if (traceInSize > 0) {
+                    traceIn.append(' ');
+                }
+                DSBytes.toHex((byte) ch, traceIn);
+                if (++traceInSize == DEBUG_COLS) {
+                    traceInSize = 0;
+                    traceIn.append('\n');
+                }
+            }
+            return ch;
+        }
+
+        @Override
+        public int read(byte[] buf) throws IOException {
+            if (!testOpen()) {
+                return -1;
+            }
+            int ret = innerIn.read(buf);
+            if (trace() && (ret > 0)) {
+                for (int i = 0; i < ret; i++) {
+                    if (traceInSize > 0) {
+                        traceIn.append(' ');
+                    }
+                    DSBytes.toHex(buf[i], traceIn);
+                    if (++traceInSize == DEBUG_COLS) {
+                        traceInSize = 0;
+                        traceIn.append('\n');
+                    }
+                }
+            }
+            return ret;
+        }
+
+        @Override
+        public int read(byte[] buf, int off, int len) throws IOException {
+            if (!testOpen()) {
+                return -1;
+            }
+            int ret = innerIn.read(buf, off, len);
+            if (trace() && (ret > 0)) {
+                for (int i = 0; i < ret; i++) {
+                    if (traceInSize > 0) {
+                        traceIn.append(' ');
+                    }
+                    DSBytes.toHex(buf[i], traceIn);
+                    if (++traceInSize == DEBUG_COLS) {
+                        traceInSize = 0;
+                        traceIn.append('\n');
+                    }
+                }
+            }
+            return ret;
+        }
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/DSRuntime.java b/dslink-core/src/main/java/org/iot/dsa/DSRuntime.java
index ea583f5f..7108613e 100644
--- a/dslink-core/src/main/java/org/iot/dsa/DSRuntime.java
+++ b/dslink-core/src/main/java/org/iot/dsa/DSRuntime.java
@@ -1,5 +1,7 @@
 package org.iot.dsa;
 
+import org.iot.dsa.time.DSTime;
+
 /**
  * DSA thread pool and timers.
  *
@@ -7,15 +9,12 @@
  */
 public class DSRuntime {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
     private static boolean alive = true;
+    private static long nextCycle = -1;
     private static RuntimeThread runtimeThread;
     private static Timer timerHead;
     private static Timer timerTail;
@@ -35,16 +34,17 @@ private DSRuntime() {
     /**
      * Returns the next time execution is needed.
      */
-    private static long executeTimers() {
+    private static void executeTimers() {
+        long now = System.currentTimeMillis();
+        long nextCycleTmp = now + 60000;
         Timer current = null;
         Timer next = null;
         Timer keepHead = null;
         Timer keepTail = null;
         long tmp;
-        long now = System.currentTimeMillis();
-        long nextCycle = now + 60000;
         //Take the task link list.
         synchronized (DSRuntime.class) {
+            nextCycle = nextCycleTmp;
             current = timerHead;
             timerHead = null;
             timerTail = null;
@@ -53,9 +53,10 @@ private static long executeTimers() {
         while (alive && (current != null)) {
             tmp = current.run(now);
             next = current.next;
+            current.next = null;
             if (tmp > 0) {
-                if (tmp < nextCycle) {
-                    nextCycle = tmp;
+                if (tmp < nextCycleTmp) {
+                    nextCycleTmp = tmp;
                 }
                 if (keepHead == null) {
                     keepHead = current;
@@ -64,13 +65,15 @@ private static long executeTimers() {
                     keepTail.next = current;
                     keepTail = current;
                 }
-                current.next = null;
             }
             current = next;
         }
         //Add the tasks that have future work back to the main linked list.
-        if (keepHead != null) {
-            synchronized (DSRuntime.class) {
+        synchronized (DSRuntime.class) {
+            if (nextCycleTmp < nextCycle) {
+                nextCycle = nextCycleTmp;
+            }
+            if (keepHead != null) {
                 if (timerHead == null) {
                     timerHead = keepHead;
                     timerTail = keepTail;
@@ -80,7 +83,6 @@ private static long executeTimers() {
                 }
             }
         }
-        return nextCycle;
     }
 
     /**
@@ -108,7 +110,10 @@ public static Timer run(Runnable arg, long start, long interval) {
                 timerTail.next = f;
                 timerTail = f;
             }
-            DSRuntime.class.notify();
+            if (start < nextCycle) {
+                nextCycle = start;
+                DSRuntime.class.notifyAll();
+            }
         }
         return f;
     }
@@ -117,7 +122,7 @@ public static Timer run(Runnable arg, long start, long interval) {
      * Run once at the given time.
      *
      * @param arg What to runAt.
-     * @param at  Execution time.  If the time is past, it'll runAt right away.
+     * @param at  Execution time.  If the time is past, it'll run right away.
      * @return For inspecting and cancel execution.
      */
     public static Timer runAt(Runnable arg, long at) {
@@ -130,7 +135,10 @@ public static Timer runAt(Runnable arg, long at) {
                 timerTail.next = f;
                 timerTail = f;
             }
-            DSRuntime.class.notify();
+            if (at < nextCycle) {
+                nextCycle = at;
+                DSRuntime.class.notifyAll();
+            }
         }
         return f;
     }
@@ -161,7 +169,7 @@ private static void shutdown() {
     /**
      * Can be used to inspect and cancel tasks passed to the run methods in DSRuntime.
      */
-    public static class Timer {
+    public static class Timer implements Runnable {
 
         private long count = 0;
         private long interval = 0;
@@ -170,6 +178,7 @@ public static class Timer {
         private long nextRun = 1; //0 == canceled, <0 == done
         private Runnable runnable;
         private boolean running = false;
+        private boolean skipMissed = true;
 
         Timer(Runnable runnable, long start, long interval) {
             this.interval = interval;
@@ -190,6 +199,20 @@ public void cancel() {
             }
         }
 
+        private long computeNextRun(long now) {
+            if (interval <= 0) {
+                return nextRun = -1;
+            }
+            if (skipMissed) {
+                while (nextRun <= now) {
+                    nextRun += interval;
+                }
+            } else {
+                nextRun += interval;
+            }
+            return nextRun;
+        }
+
         /**
          * The interval between runs, zero or less for no interval.
          */
@@ -216,7 +239,7 @@ public boolean isFinished() {
         }
 
         /**
-         * Trun only when the runnable is actually being run.
+         * True when the runnable is being actually being executed.
          */
         public boolean isRunning() {
             return running;
@@ -238,6 +261,17 @@ public long nextRun() {
             return nextRun;
         }
 
+        /**
+         * Do not call.
+         */
+        public void run() {
+            try {
+                runnable.run();
+            } finally {
+                running = false;
+            }
+        }
+
         /**
          * Executes the task if it is time.
          *
@@ -251,19 +285,17 @@ long run(long now) {
             if (now < nextRun) {
                 return nextRun;
             }
+            if (running) {
+                if (skipMissed) {
+                    return computeNextRun(now);
+                }
+                return nextRun;
+            }
             running = true;
-            DSRuntime.run(runnable);
+            DSRuntime.run(this);
             count++;
-            running = false;
             lastRun = nextRun;
-            if (interval > 0) {
-                while (nextRun <= now) {
-                    nextRun += interval;
-                }
-            } else {
-                nextRun = -1;
-            }
-            return nextRun;
+            return computeNextRun(now);
         }
 
         /**
@@ -273,6 +305,25 @@ public long runCount() {
             return count;
         }
 
+        /**
+         * The default is true, set this to false if all intervals should be run, even if they run
+         * later than scheduled.
+         *
+         * @param skipMissed False if intervals should be run after they were scheduled to.
+         * @return this
+         */
+        public Timer setSkipMissedIntervals(boolean skipMissed) {
+            this.skipMissed = skipMissed;
+            return this;
+        }
+
+        public String toString() {
+            StringBuilder buf = new StringBuilder();
+            DSTime.encode(nextRun, false, buf);
+            buf.append(" - ").append(runnable.toString());
+            return buf.toString();
+        }
+
     } //Timer
 
     /**
@@ -286,23 +337,24 @@ public RuntimeThread() {
         }
 
         public void run() {
-            long delta, nextCycle;
+            long delta;
             while (alive) {
-                nextCycle = executeTimers();
-                delta = nextCycle - System.currentTimeMillis();
-                if (delta > 0) {
-                    synchronized (DSRuntime.class) {
+                executeTimers();
+                synchronized (DSRuntime.class) {
+                    delta = nextCycle - System.currentTimeMillis();
+                    if (delta > 0) {
                         try {
                             DSRuntime.class.wait(delta);
                         } catch (Exception ignore) {
                         }
                     }
-                } else {
+                }
+                if (delta <= 0) {
                     Thread.yield();
                 }
             }
         }
-    } //RuntimeThread.
+    } //RuntimeThread
 
     private static class ShutdownThread extends Thread {
 
@@ -323,8 +375,9 @@ public void run() {
     static {
         Runtime.getRuntime().addShutdownHook(new ShutdownThread());
         threadPool = new DSThreadPool("DSRuntime");
-        int min = Math.max(1, DSThreadPool.getNumProcessors());
-        threadPool.setMinMax(min, DSThreadPool.getNumProcessors() * 25);
+        int min = Math.max(4, DSThreadPool.getNumProcessors());
+        threadPool.setMinMax(min, -1);
+        //threadPool.setMinMax(min, DSThreadPool.getNumProcessors() * 25);
         runtimeThread = new RuntimeThread();
         runtimeThread.start();
     }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSInternalErrorException.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSInternalErrorException.java
new file mode 100644
index 00000000..b4063b85
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSInternalErrorException.java
@@ -0,0 +1,17 @@
+package org.iot.dsa.dslink;
+
+/**
+ * Indicates an unsupported method.
+ *
+ * @author Aaron Hansen
+ */
+public class DSInternalErrorException extends RuntimeException {
+
+    public DSInternalErrorException() {
+    }
+
+    public DSInternalErrorException(String message) {
+        super(message);
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java
index 9ff42b71..2a7655e7 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java
@@ -1,77 +1,65 @@
 package org.iot.dsa.dslink;
 
-import com.acuity.iot.dsa.dslink.protocol.protocol_v1.DS1LinkConnection;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import org.iot.dsa.DSRuntime;
-import org.iot.dsa.dslink.responder.InboundInvokeRequest;
-import org.iot.dsa.dslink.responder.InboundListRequest;
-import org.iot.dsa.dslink.responder.InboundSetRequest;
-import org.iot.dsa.dslink.responder.InboundSubscribeRequest;
-import org.iot.dsa.dslink.responder.OutboundListResponse;
-import org.iot.dsa.dslink.responder.SubscriptionCloseHandler;
 import org.iot.dsa.io.NodeDecoder;
 import org.iot.dsa.io.NodeEncoder;
 import org.iot.dsa.io.json.JsonReader;
 import org.iot.dsa.io.json.JsonWriter;
 import org.iot.dsa.logging.DSLogging;
-import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
-import org.iot.dsa.node.action.ActionInvocation;
-import org.iot.dsa.node.action.ActionResult;
-import org.iot.dsa.node.action.DSAction;
 import org.iot.dsa.security.DSKeys;
 import org.iot.dsa.time.DSTime;
 import org.iot.dsa.util.DSException;
 
 /**
  * Represents an upstream connection, a node tree, and manages the lifecycle of both.
- *
  * <p>
- *
+ * <p>
+ * <p>
  * Links are created with DSLinkConfig object. The main method of the process is responsible for
  * creating the config.  After instantiation, the link should call DSLink.run()
- *
  * <p>
- *
+ * <p>
+ * <p>
  * Lifecycle:
- *
+ * <p>
  * TODO
  *
  * @author Aaron Hansen
  */
-public class DSLink extends DSNode implements DSIResponder, Runnable {
+public class DSLink extends DSNode implements Runnable {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////////
 
-    static final String NODES = "Nodes";
-    static final String SAVE = "Save";
+    static final String MAIN = "main";
+    static final String SYS = "sys";
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
     private DSLinkConfig config;
-    private DSLinkConnection connection;
     private String dsId;
     private DSKeys keys;
-    private Logger logger;
+    private DSInfo main = getInfo(MAIN);
     private String name;
-    private DSInfo nodes = getInfo(NODES);
-    private DSInfo save = getInfo(SAVE);
+    private Thread runThread;
     private boolean saveEnabled = true;
+    private DSInfo sys = getInfo(SYS);
 
     ///////////////////////////////////////////////////////////////////////////
     // Constructors
@@ -94,8 +82,8 @@ public DSLink() {
      */
     @Override
     protected void declareDefaults() {
-        declareDefault(SAVE, new DSAction()).setConfig(true);
-        declareDefault(NODES, new DSNode());
+        declareDefault(MAIN, new DSNode());
+        declareDefault(SYS, new DSSysNode()).setAdmin(true);
     }
 
     public DSLinkConfig getConfig() {
@@ -103,7 +91,7 @@ public DSLinkConfig getConfig() {
     }
 
     public DSLinkConnection getConnection() {
-        return connection;
+        return getSys().getConnection();
     }
 
     /**
@@ -137,19 +125,17 @@ public String getLinkName() {
         return name;
     }
 
-    /**
-     * The logger as defined in dslink.json.
-     */
     @Override
-    public Logger getLogger() {
-        return logger;
+    protected String getLogName() {
+        return getClass().getSimpleName();
     }
 
-    /**
-     * Returns the root of the node tree.
-     */
-    public DSRootNode getNodes() {
-        return (DSRootNode) nodes.getNode();
+    public DSMainNode getMain() {
+        return (DSMainNode) main.getNode();
+    }
+
+    public DSSysNode getSys() {
+        return (DSSysNode) sys.getNode();
     }
 
     /**
@@ -162,19 +148,7 @@ protected DSLink init(DSLinkConfig config) {
         DSLogging.setDefaultLevel(config.getLogLevel());
         name = config.getLinkName();
         keys = config.getKeys();
-        logger = DSLogging.getLogger(name, config.getLogFile());
-        try {
-            String type = config.getConfig(DSLinkConfig.CFG_CONNECTION_TYPE, null);
-            if (type != null) {
-                config(config() ? "Connection type: " + type : null);
-                connection = (DSLinkConnection) Class.forName(type).newInstance();
-            } else {
-                connection = new DS1LinkConnection();
-            }
-            put("Broker Connection", connection).setConfig(true).setTransient(true);
-        } catch (Exception x) {
-            DSException.throwRuntime(x);
-        }
+        getSys().init();
         return this;
     }
 
@@ -188,7 +162,7 @@ public static DSLink load(DSLinkConfig config) {
         DSLink ret = null;
         File nodes = config.getNodesFile();
         if (nodes.exists()) {
-            logger.info("Loading node database...");
+            logger.info("Loading node database " + nodes.getAbsolutePath());
             long time = System.currentTimeMillis();
             JsonReader reader = new JsonReader(nodes);
             DSNode node = NodeDecoder.decode(reader);
@@ -197,7 +171,7 @@ public static DSLink load(DSLinkConfig config) {
                 ret = (DSLink) node;
             } else {
                 ret = new DSLink();
-                ret.setNodes((DSRootNode) node);
+                ret.setNodes((DSMainNode) node);
             }
             ret.init(config);
             time = System.currentTimeMillis() - time;
@@ -206,14 +180,14 @@ public static DSLink load(DSLinkConfig config) {
             ret = new DSLink();
             ret.init(config);
             ret.info("Creating new database...");
-            String type = config.getRootType();
+            String type = config.getMainType();
             if (type == null) {
-                throw new IllegalStateException("Config missing the root node type");
+                throw new IllegalStateException("Config missing the main node type");
             }
-            ret.config("Nodes type: " + type);
+            ret.fine("Main type: " + type);
             try {
                 DSNode node = (DSNode) Class.forName(type).newInstance();
-                ret.put(NODES, node);
+                ret.put(MAIN, node);
             } catch (Exception x) {
                 DSException.throwRuntime(x);
             }
@@ -226,112 +200,16 @@ public static DSLink load(DSLinkConfig config) {
 
     /**
      * This is a convenience for DSLink.load(new DSLinkConfig(args)).run() and can be used as the
-     * the main class for any link.
+     * the main class for any link.  Use DSLink.shutdown() to stop running.
      */
     public static void main(String[] args) {
-        DSLinkConfig cfg = new DSLinkConfig(args);
-        DSLink link = DSLink.load(cfg);
-        link.run();
-    }
-
-    /**
-     * Handles the save action.
-     */
-    public ActionResult onInvoke(DSInfo actionInfo, ActionInvocation invocation) {
-        if (actionInfo == save) {
-            DSRuntime.run(new Runnable() {
-                @Override
-                public void run() {
-                    save();
-                }
-            });
-            return null;
-        }
-        return super.onInvoke(actionInfo, invocation);
-    }
-
-    /**
-     * Responder implementation.  If one of the children in the path implements DSResponder, it will
-     * be given responsibility for completing the request.
-     */
-    @Override
-    public ActionResult onInvoke(InboundInvokeRequest request) {
-        RequestPath path = new RequestPath(request.getPath(), this);
-        if (path.isResponder()) {
-            DSIResponder responder = (DSIResponder) path.getTarget();
-            return responder.onInvoke(new InvokeWrapper(path, request));
-        }
-        DSInfo info = path.getInfo();
-        if (!info.isAction()) {
-            throw new DSRequestException("Not an action " + path.getPath());
-        }
-        //TODO verify incoming permission
-        DSAction action = info.getAction();
-        return action.invoke(info, request);
-    }
-
-    /**
-     * Responder implementation.  If one of the children in the path implements DSResponder, it will
-     * be given responsibility for completing the request.
-     */
-    @Override
-    public OutboundListResponse onList(InboundListRequest request) {
-        RequestPath path = new RequestPath(request.getPath(), this);
-        if (path.isResponder()) {
-            DSIResponder responder = (DSIResponder) path.getTarget();
-            return responder.onList(new ListWrapper(path.getPath(), request));
-        }
-        return new ListSubscriber(path, request);
-    }
-
-    /**
-     * Responder implementation.  If one of the children in the path implements DSResponder, it will
-     * be given responsibility for completing the request.
-     */
-    @Override
-    public SubscriptionCloseHandler onSubscribe(InboundSubscribeRequest request) {
-        RequestPath path = new RequestPath(request.getPath(), this);
-        if (path.isResponder()) {
-            DSIResponder responder = (DSIResponder) path.getTarget();
-            return responder.onSubscribe(new SubscribeWrapper(path.getPath(), request));
-        }
-        return new ValueSubscriber(path, request);
-    }
-
-
-    /**
-     * Responder implementation.  If one of the children in the path implements DSResponder, it will
-     * be given responsibility for completing the request.
-     */
-    @Override
-    public void onSet(InboundSetRequest request) {
-        RequestPath path = new RequestPath(request.getPath(), this);
-        if (path.isResponder()) {
-            DSIResponder responder = (DSIResponder) path.getTarget();
-            responder.onSet(new SetWrapper(path.getPath(), request));
-        }
-        DSNode parent = path.getParent();
-        DSInfo info = path.getInfo();
-        if (info.isReadOnly()) {
-            throw new DSRequestException("Not writable: " + getPath());
-        }
-        //TODO verify incoming permission
-        if (info.isNode()) {
-            info.getNode().onSet(request.getValue());
-            return;
-        }
-        DSIValue value = info.getValue();
-        if (value == null) {
-            if (info.getDefaultObject() instanceof DSIValue) {
-                value = (DSIValue) info.getDefaultObject();
-            }
-        }
-        if (value != null) {
-            value = value.valueOf(request.getValue());
-        } else {
-            value = request.getValue();
+        try {
+            DSLinkConfig cfg = new DSLinkConfig(args);
+            DSLink link = DSLink.load(cfg);
+            link.run();
+        } catch (Exception x) {
+            x.printStackTrace();
         }
-        parent.onSet(info, value);
     }
 
     /**
@@ -339,43 +217,63 @@ public void onSet(InboundSetRequest request) {
      * stopped.
      */
     public void run() {
-        info(info() ? "Starting nodes" : null);
-        start();
-        long stableDelay = config.getConfig(DSLinkConfig.CFG_STABLE_DELAY, 5000l);
-        try {
-            Thread.sleep(stableDelay);
-        } catch (Exception x) {
-            warn("Interrupted stable delay", x);
+        synchronized (this) {
+            if (runThread != null) {
+                throw new IllegalStateException("Already running.");
+            }
+            runThread = Thread.currentThread();
         }
         try {
-            info(info() ? "Stabilizing nodes" : null);
-            stable();
-            long saveInterval = config.getConfig(DSLinkConfig.CFG_SAVE_INTERVAL, 60);
-            saveInterval *= 60000;
-            long nextSave = System.currentTimeMillis() + saveInterval;
-            while (isRunning()) {
-                synchronized (this) {
-                    try {
-                        wait(10000);
-                    } catch (InterruptedException x) {
-                        warn(getPath(), x);
-                    }
-                    if (System.currentTimeMillis() > nextSave) {
-                        save();
-                        nextSave = System.currentTimeMillis() + saveInterval;
+            Class clazz = DSLink.class;
+            try {
+                URL src = clazz.getProtectionDomain().getCodeSource().getLocation();
+                info(info() ? src : null);
+            } catch (Throwable t) {
+                warn("Reporting source of DSLink.class", t);
+            }
+            Runtime.getRuntime().addShutdownHook(new Thread() {
+                public void run() {
+                    info("Running shutdown hook");
+                    shutdown();
+                }
+            });
+            info(info() ? "Starting nodes" : null);
+            start();
+            long stableDelay = config.getConfig(DSLinkConfig.CFG_STABLE_DELAY, 5000l);
+            try {
+                Thread.sleep(stableDelay);
+            } catch (Exception x) {
+                warn("Interrupted stable delay", x);
+            }
+            try {
+                info(info() ? "Stabilizing nodes" : null);
+                stable();
+                long saveInterval = config.getConfig(DSLinkConfig.CFG_SAVE_INTERVAL, 60);
+                saveInterval *= 60000;
+                long nextSave = System.currentTimeMillis() + saveInterval;
+                while (isRunning()) {
+                    synchronized (this) {
+                        try {
+                            wait(10000);
+                        } catch (InterruptedException x) {
+                            warn(getPath(), x);
+                        }
+                        if (System.currentTimeMillis() > nextSave) {
+                            save();
+                            nextSave = System.currentTimeMillis() + saveInterval;
+                        }
                     }
                 }
+            } catch (Exception x) {
+                error(getLinkName(), x);
+                stop();
+                DSException.throwRuntime(x);
             }
-        } catch (Exception x) {
-            severe(getLinkName(), x);
-            stop();
-            DSException.throwRuntime(x);
+            save();
+            DSLogging.close();
+        } finally {
+            runThread = null;
         }
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            public void run() {
-                save();
-            }
-        });
     }
 
     @Override
@@ -396,60 +294,93 @@ public void save() {
         InputStream in = null;
         try {
             File nodes = config.getNodesFile();
+            String name = nodes.getName();
             if (nodes.exists()) {
-                info("Backing up the node database");
+                info("Backing up the node database...");
                 StringBuilder buf = new StringBuilder();
-                buf.append(nodes.getName()).append('.');
                 Calendar cal = DSTime.getCalendar(System.currentTimeMillis());
-                DSTime.encodeForFiles(cal, buf);
-                DSTime.recycle(cal);
-                buf.append(".zip");
-                File back = new File(nodes.getParent(), buf.toString());
-                FileOutputStream fos = new FileOutputStream(back);
-                zos = new ZipOutputStream(fos);
-                zos.putNextEntry(new ZipEntry(nodes.getName()));
-                byte[] b = new byte[4096];
-                in = new FileInputStream(nodes);
-                int len = in.read(b);
-                while (len > 0) {
-                    zos.write(b, 0, len);
-                    len = in.read(b);
+                if (name.endsWith(".zip")) {
+                    String tmp = name.substring(0, name.lastIndexOf(".zip"));
+                    buf.append(tmp).append('.');
+                    DSTime.encodeForFiles(cal, buf);
+                    buf.append(".zip");
+                    File bakFile = new File(nodes.getParent(), buf.toString());
+                    nodes.renameTo(bakFile);
+                } else {
+                    buf.append(name).append('.');
+                    DSTime.encodeForFiles(cal, buf);
+                    buf.append(".zip");
+                    File back = new File(nodes.getParent(), buf.toString());
+                    FileOutputStream fos = new FileOutputStream(back);
+                    zos = new ZipOutputStream(fos);
+                    zos.putNextEntry(new ZipEntry(nodes.getName()));
+                    byte[] b = new byte[4096];
+                    in = new FileInputStream(nodes);
+                    int len = in.read(b);
+                    while (len > 0) {
+                        zos.write(b, 0, len);
+                        len = in.read(b);
+                    }
+                    in.close();
+                    in = null;
+                    zos.closeEntry();
+                    zos.close();
+                    zos = null;
                 }
-                in.close();
-                in = null;
-                zos.closeEntry();
-                zos.close();
-                zos = null;
+                DSTime.recycle(cal);
             }
             long time = System.currentTimeMillis();
-            info("Saving node database");
-            JsonWriter writer = new JsonWriter(nodes);
+            info("Saving node database " + nodes.getAbsolutePath());
+            JsonWriter writer = null;
+            if (name.endsWith(".zip")) {
+                String tmp = name.substring(0, name.lastIndexOf(".zip"));
+                writer = new JsonWriter(nodes, tmp + ".json");
+            } else {
+                writer = new JsonWriter(nodes);
+            }
             NodeEncoder.encode(writer, this);
             writer.close();
             trimBackups();
             time = System.currentTimeMillis() - time;
             info("Node database saved: " + time + "ms");
         } catch (Exception x) {
-            severe("Saving node database", x);
+            error("Saving node database", x);
         }
         try {
             if (in != null) {
                 in.close();
             }
         } catch (IOException x) {
-            severe("Closing input", x);
+            error("Closing input", x);
         }
         try {
             if (zos != null) {
                 zos.close();
             }
         } catch (IOException x) {
-            severe("Closing output", x);
+            error("Closing output", x);
         }
     }
 
-    public DSLink setNodes(DSRootNode root) {
-        put(nodes, root);
+    /**
+     * Properly shuts down the link when a thread is executing the run method.
+     */
+    public void shutdown() {
+        stop();
+        if (runThread == null) {
+            return;
+        }
+        synchronized (runThread) {
+            try {
+                runThread.join();
+            } catch (Exception x) {
+                fine(x);
+            }
+        }
+    }
+
+    public DSLink setNodes(DSMainNode node) {
+        put(main, node);
         return this;
     }
 
@@ -469,10 +400,26 @@ private void trimBackups() {
         if (nodes == null) {
             return;
         }
+        final String nodesName = nodes.getName();
+        final boolean isZip = nodesName.endsWith(".zip");
+        int idx = nodesName.lastIndexOf('.');
+        final String nameBase = nodesName.substring(0, idx);
         File dir = nodes.getAbsoluteFile().getParentFile();
         File[] backups = dir.listFiles(new FilenameFilter() {
             public boolean accept(File dir, String name) {
-                return name.endsWith(".zip") && name.startsWith(nodes.getName());
+                if (name.equals(nodesName)) {
+                    return false;
+                }
+                if (isZip) {
+                    if (name.endsWith(".zip")) {
+                        return name.startsWith(nameBase);
+                    }
+                } else {
+                    if (name.endsWith(".json")) {
+                        return name.startsWith(nameBase);
+                    }
+                }
+                return false;
             }
         });
         if (backups == null) {
@@ -487,12 +434,4 @@ public boolean accept(File dir, String name) {
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConfig.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConfig.java
index 8288e2bc..c73b6294 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConfig.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConfig.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.util.logging.Level;
 import org.iot.dsa.io.json.JsonReader;
+import org.iot.dsa.logging.DSILevels;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.security.DSKeys;
 
@@ -13,7 +14,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSLinkConfig {
+public class DSLinkConfig implements DSILevels {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
@@ -21,33 +22,29 @@ public class DSLinkConfig {
 
     public static final String CFG_AUTH_TOKEN = "token";
     public static final String CFG_BROKER_URL = "broker";
-    public static final String CFG_CONNECTION_TYPE = "connectionType";
-    public static final String CFG_IS_REQUESTER = "isRequester";
-    public static final String CFG_IS_RESPONDER = "isResponder";
     public static final String CFG_KEY_FILE = "key";
-    public static final String CFG_LOG_FILE = "logFile";
     public static final String CFG_LOG_LEVEL = "log";
     public static final String CFG_NODE_FILE = "nodes";
+
+    public static final String CFG_CONNECTION_TYPE = "connectionType";
     public static final String CFG_READ_TIMEOUT = "readTimeout";
-    public static final String CFG_ROOT_TYPE = "rootType";
     public static final String CFG_SAVE_INTERVAL = "saveInterval";
     public static final String CFG_STABLE_DELAY = "stableDelay";
-    public static final String CFG_TRANSPORT_FACTORY = "transportFactory";
+    public static final String CFG_WS_TRANSPORT_FACTORY = "wsTransportFactory";
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
     private String brokerUri;
-    private String dsId;
+    private String dsaVersion;
     private DSMap dslinkJson;
     private boolean help = false;
     private DSKeys keys;
     private String linkName;
-    private File logFile;
     private Level logLevel;
     private File nodesFile;
-    private String rootType;
+    private String mainType;
     private String token;
     private File workingDir = new File(".");
 
@@ -69,6 +66,7 @@ public DSLinkConfig() {
      */
     public DSLinkConfig(File workingDir) {
         this.workingDir = workingDir;
+        setDslinkJson(new File(workingDir, "dslink.json"));
     }
 
     /**
@@ -76,6 +74,7 @@ public DSLinkConfig(File workingDir) {
      * character.
      */
     public DSLinkConfig(String args) {
+        setDslinkJson(new File("dslink.json"));
         parse(args.split(" +"));
     }
 
@@ -83,6 +82,7 @@ public DSLinkConfig(String args) {
      * Constructor for the arguments pass to a main method.
      */
     public DSLinkConfig(String[] args) {
+        setDslinkJson(new File("dslink.json"));
         parse(args);
     }
 
@@ -188,6 +188,21 @@ private DSMap getConfigMap(String name, boolean create) {
         return tmp;
     }
 
+    public String getDsaVersion() {
+        String brokerUri = getBrokerUri();
+        if (brokerUri != null) {
+            if (brokerUri.startsWith("http")) {
+                if (brokerUri.indexOf("/conn") > 0) {
+                    return "1.0";
+                }
+            }
+        }
+        if (dsaVersion == null) {
+            dsaVersion = getDslinkJson().get("dsa-version", "2.0");
+        }
+        return dsaVersion;
+    }
+
     /**
      * If not set, this will attempt to open dslink.json in the working the process directory.
      */
@@ -209,7 +224,7 @@ public static String getHelpText() {
            .append(" --token|-t   Authentication token for the connection handshake.\n")
            .append(" --nodes|-n   Path to the configuration node database.\n")
            .append(" --key|-k     Path to the stored keys.\n")
-           .append(" --Log|-l     Log level (finest,finer,fine,config,info,warning,severe).\n")
+           .append(" --log|-l     Log level (finest,finer,fine,config,info,warning,severe).\n")
            .append(" --dslink-json|-d  Location of the dslink.json file.\n")
            .append(" --name       Name of the link implementation, for example ")
            .append("dslink-java-modbus.\n")
@@ -235,13 +250,6 @@ public String getLinkName() {
         return linkName;
     }
 
-    public File getLogFile() {
-        if (logFile == null) {
-            setLogFile(new File(getConfig(CFG_LOG_FILE, getLinkName() + ".log")));
-        }
-        return logFile;
-    }
-
     /**
      * If not set, will attempt to use the getConfig in dslink.json but fall back to 'info' if
      * necessary.
@@ -254,12 +262,12 @@ public Level getLogLevel() {
     }
 
     /**
-     * If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.json' in
+     * If not set, will attempt to use the getConfig in dslink.json but fall back to 'nodes.zip' in
      * the process directory if necessary.
      */
     public File getNodesFile() {
         if (nodesFile == null) {
-            setNodesFile(new File(getConfig(CFG_NODE_FILE, "nodes.json")));
+            setNodesFile(new File(getConfig(CFG_NODE_FILE, "nodes.zip")));
         }
         return nodesFile;
     }
@@ -267,14 +275,17 @@ public File getNodesFile() {
     /**
      * The type of the root node.
      */
-    public String getRootType() {
-        if (rootType == null) {
-            rootType = getConfig(CFG_ROOT_TYPE, null);
-            if (rootType == null) {
-                throw new IllegalStateException("Missing rootType config.");
-            }
+    public String getMainType() {
+        if (mainType == null) { //legacy
+            mainType = getConfig("handler_class", null);
+        }
+        if (mainType == null) { //legacy
+            mainType = getConfig("mainType", null);
         }
-        return rootType;
+        if (mainType == null) {
+            throw new IllegalStateException("Missing main node type in config.");
+        }
+        return mainType;
     }
 
     /**
@@ -287,20 +298,6 @@ public String getToken() {
         return token;
     }
 
-    /**
-     * Looks for the isRequester config, false by default.
-     */
-    public boolean isRequester() {
-        return getConfig(CFG_IS_REQUESTER, false);
-    }
-
-    /**
-     * Looks for the isResponder config, true by default.
-     */
-    public boolean isResponder() {
-        return getConfig(CFG_IS_RESPONDER, true);
-    }
-
     /**
      * Parses command line args to set the internal state of this object.
      *
@@ -341,10 +338,10 @@ private void processParsed(String key, String value) {
                 setDslinkJson(new File(value));
             } else if (key.equals("--help")) {
                 help = true;
+            } else if (key.equals("--log")) {
+                setLogLevel(value);
             } else if (key.equals("--logging")) {
                 setLogLevel(value);
-            } else if (key.equals("--logging-file")) {
-                setLogFile(new File(value));
             } else if (key.equals("--key")) {
                 setKeys(new File(value));
             } else if (key.equals("--name")) {
@@ -365,8 +362,6 @@ private void processParsed(String key, String value) {
                 help = true;
             } else if (key.equals("-l")) {
                 setLogLevel(value);
-            } else if (key.equals("-f")) {
-                setLogFile(new File(value));
             } else if (key.equals("-k")) {
                 setKeys(new File(value));
             } else if (key.equals("-n")) {
@@ -474,30 +469,37 @@ public DSLinkConfig setLinkName(String arg) {
         return this;
     }
 
-    /**
-     * Overrides dslink.json.
-     */
-    public DSLinkConfig setLogFile(File arg) {
-        logFile = arg;
-        return setConfig(CFG_LOG_FILE, arg.getAbsolutePath());
-    }
-
     /**
      * Should be one of the following (case insensitive): all, finest, finer, fine, config, info,
      * warning, severe, off. <p> Overrides dslink.json.
      */
     public DSLinkConfig setLogLevel(String level) {
         level = level.toUpperCase();
-        if (level.equals("DEBUG")) {
-            level = "FINEST";
+        if (level.equals("TRACE")) {
+            logLevel = trace;
+        } else if (level.equals("DEBUG")) {
+            logLevel = debug;
+        } else if (level.equals("FINE")) {
+            logLevel = fine;
+        } else if (level.equals("CONFIG")) {
+            logLevel = fine;
+        } else if (level.equals("WARN")) {
+            logLevel = warn;
+        } else if (level.equals("INFO")) {
+            logLevel = info;
         } else if (level.equals("ERROR")) {
-            level = "WARNING";
+            logLevel = error;
+        } else if (level.equals("ADMIN")) {
+            logLevel = admin;
         } else if (level.equals("CRITICAL")) {
-            level = "SEVERE";
+            logLevel = fatal;
+        } else if (level.equals("FATAL")) {
+            logLevel = fatal;
         } else if (level.equals("NONE")) {
-            level = "OFF";
+            logLevel = off;
+        } else {
+            logLevel = Level.parse(level);
         }
-        logLevel = Level.parse(level);
         return setConfig(CFG_LOG_LEVEL, level);
     }
 
@@ -517,27 +519,11 @@ public DSLinkConfig setNodesFile(File file) {
         return setConfig(CFG_NODE_FILE, file.getAbsolutePath());
     }
 
-    /**
-     * Overrides dslink.json.
-     */
-    public DSLinkConfig setRequester(boolean isRequester) {
-        setConfig(CFG_IS_REQUESTER, isRequester);
-        return this;
-    }
-
-    /**
-     * Overrides dslink.json.
-     */
-    public DSLinkConfig setResponder(boolean isResponder) {
-        setConfig(CFG_IS_RESPONDER, isResponder);
-        return this;
-    }
-
     /**
      * The type of the root node.
      */
-    public DSLinkConfig setRootType(Class clazz) {
-        rootType = clazz.getName();
+    public DSLinkConfig setMainType(Class clazz) {
+        mainType = clazz.getName();
         return this;
     }
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConnection.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConnection.java
index 187ae6d6..cba409dc 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConnection.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkConnection.java
@@ -1,61 +1,251 @@
 package org.iot.dsa.dslink;
 
+import com.acuity.iot.dsa.dslink.protocol.DSSession;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.util.concurrent.ConcurrentHashMap;
 import org.iot.dsa.node.DSNode;
+import org.iot.dsa.time.DSTime;
 
 /**
  * Represents an upstream connection with a broker.
- *
- * Implementations must have a no-arg public constructor.  It will be dynamically added as a child
- * of the DSLink.
- *
- * The default connection type can be overridden by specifying the config connectionType as a Java
- * class name dslink.json.
+ * <p>
+ * Implementations must have a no-arg public constructor.  It will be dynamically added as
+ * a child of the DSLink.
  *
  * @author Aaron Hansen
  */
 public abstract class DSLinkConnection extends DSNode {
 
+    // Fields
+    // ------
+
+    private boolean connected = false;
+    private String connectionId;
+    private ConcurrentHashMap<Listener, Listener> listeners;
+
+    // Methods
+    // -------
+
+    /**
+     * Adds a listener for connection events.  If already connected, onConnect
+     * will be called on the listener.
+     */
+    public void addListener(Listener listener) {
+        synchronized (this) {
+            if (listeners == null) {
+                listeners = new ConcurrentHashMap<Listener, Listener>();
+            }
+        }
+        listeners.put(listener, listener);
+        if (isConnected()) {
+            try {
+                listener.onConnect(this);
+            } catch (Exception x) {
+                error(getPath(), x);
+            }
+        }
+    }
+
     /**
-     * Adds a listener for connection events.
+     * Forcefully closes an open connection.  Does not prevent reconnection, intended for
+     * dealing with problems.
      */
-    public abstract void addListener(Listener listener);
+    public abstract void disconnect();
 
     /**
      * A unique descriptive tag such as a combination of the link name and the broker host.
      */
-    public abstract String getConnectionId();
+    public String getConnectionId() {
+        if (connectionId == null) {
+            StringBuilder builder = new StringBuilder();
+            builder.append(getLink().getLinkName()).append("-");
+            String uri = getLink().getConfig().getBrokerUri();
+            if ((uri != null) && !uri.isEmpty()) {
+                int idx = uri.indexOf("://") + 3;
+                if ((idx > 0) && (uri.length() > idx)) {
+                    int end = uri.indexOf("/", idx);
+                    if (end > idx) {
+                        builder.append(uri.substring(idx, end));
+                    } else {
+                        builder.append(uri.substring(idx));
+                    }
+                }
+            } else {
+                builder.append(Integer.toHexString(hashCode()));
+            }
+            connectionId = builder.toString();
+            info(info() ? "Connection ID: " + connectionId : null);
+        }
+        return connectionId;
+    }
+
 
     /**
      * The link using this connection.
      */
-    public abstract DSLink getLink();
+    public DSLink getLink() {
+        return (DSLink) getSys().getParent();
+    }
+
+    @Override
+    protected String getLogName() {
+        return getClass().getSimpleName();
+    }
+
+    public DSSysNode getSys() {
+        return (DSSysNode) getParent();
+    }
 
     public abstract DSIRequester getRequester();
 
+    public abstract DSSession getSession();
+
+    public abstract DSTransport getTransport();
+
     /**
      * True when a connection is established with the remote endpoint.
      */
-    public abstract boolean isOpen();
+    public boolean isConnected() {
+        return connected;
+    }
+
+    /**
+     * Called after onInitialize and before onRun.  This should open the connection,
+     * maybe do some preamble messaging, but should return relatively quickly.  Use
+     * onRun for the long running of the connection.
+     */
+    protected abstract void onConnect();
+
+    /**
+     * Called when this network connection has been closed.  This will only be called
+     * if the connection is has been established and onRun was called.
+     */
+    protected abstract void onDisconnect();
+
+    /**
+     * Always called before onConnect.  If an exception is thrown onConnect and onDisconnect
+     * will not be called.
+     */
+    protected abstract void onInitialize();
+
+    /**
+     * The long term management of the connection (reading and writing).  When this
+     * returns, onDisconnect will be called.
+     */
+    protected abstract void onRun();
 
     /**
-     * Called the when network connection has been closed.
+     * Starts the connection.
      */
-    public abstract void onClose();
+    @Override
+    protected void onStable() {
+        new ConnectionRunThread(new ConnectionRunner()).start();
+    }
 
     /**
      * Removes a listener for connection events.
      */
-    public abstract void removeListener(Listener listener);
+    public void removeListener(Listener listener) {
+        if (listeners != null) {
+            listeners.remove(listener);
+        }
+    }
+
+    // Inner Classes
+    // -------------
+
+    /**
+     * Daemon thread that manages connection and reconnection.
+     */
+    private class ConnectionRunner implements Runnable {
+
+        private long reconnectRate = 1000;
+
+        /**
+         * Runs until stop is called.
+         */
+        public void run() {
+            while (isRunning()) {
+                synchronized (this) {
+                    try {
+                        wait(reconnectRate);
+                    } catch (Exception x) {
+                        warn(warn() ? getConnectionId() : null, x);
+                    }
+                }
+                reconnectRate = Math.min(reconnectRate * 2, DSTime.MILLIS_MINUTE);
+                try {
+                    onInitialize();
+                } catch (Exception x) {
+                    error(getPath(), x);
+                    continue;
+                }
+                try {
+                    onConnect();
+                    connected = true;
+                } catch (Exception x) {
+                    error(getPath(), x);
+                    continue;
+                }
+                if (listeners != null) {
+                    for (Listener listener : listeners.keySet()) {
+                        try {
+                            listener.onConnect(DSLinkConnection.this);
+                        } catch (Exception x) {
+                            error(listener.toString(), x);
+                        }
+                    }
+                }
+                try {
+                    onRun();
+                    reconnectRate = 1000;
+                } catch (Throwable x) {
+                    reconnectRate = Math.min(reconnectRate * 2, DSTime.MILLIS_MINUTE);
+                    error(getConnectionId(), x);
+                }
+                try {
+                    onDisconnect();
+                } catch (Exception x) {
+                    error(getPath(), x);
+                }
+                if (listeners != null) {
+                    for (Listener listener : listeners.keySet()) {
+                        try {
+                            listener.onDisconnect(DSLinkConnection.this);
+                        } catch (Exception x) {
+                            error(listener.toString(), x);
+                        }
+                    }
+                }
+            }
+        }
+    } //ConnectionRunner
+
+    /**
+     * Daemon thread that manages connection and reconnection.
+     */
+    private class ConnectionRunThread extends Thread {
+
+        public ConnectionRunThread(ConnectionRunner runner) {
+            super(runner);
+            setName(getConnectionId() + " Runner");
+            setDaemon(true);
+        }
+    }
 
-    public static interface Listener {
+    /**
+     * Intended for requester functionality so that requesters can know when to
+     * start and stop making requests.
+     */
+    public interface Listener {
 
         /**
-         * Called when the connection with the endpoint is closed.
+         * Called asynchronously after the connection with the endpoint is opened.
          */
         public void onConnect(DSLinkConnection connection);
 
         /**
-         * Called when the connection with the endpoint is established.
+         * Called synchronously after the connection with the endpoint is closed.
          */
         public void onDisconnect(DSLinkConnection connection);
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkSession.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkSession.java
deleted file mode 100644
index 0ee0d6ef..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSLinkSession.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.iot.dsa.dslink;
-
-/**
- * Represents a line of communication with a remote entity.
- *
- * @author Aaron Hansen
- */
-public interface DSLinkSession {
-
-    /**
-     * The associate connection.
-     */
-    public DSLinkConnection getConnection();
-
-    /**
-     * Large outbound messages that can be broken into smaller ones should check this occasionally
-     * when writing.  The idea is to prevent buffer overflows as well as not have a single message
-     * hog communication.
-     */
-    public boolean shouldEndMessage();
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSMainNode.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSMainNode.java
new file mode 100644
index 00000000..96144177
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSMainNode.java
@@ -0,0 +1,49 @@
+package org.iot.dsa.dslink;
+
+import org.iot.dsa.node.DSNode;
+
+/**
+ * The root DSNode that triggers a link's custom functionality .  Most links will subclass this and
+ * override declareDefaults() to bind their application logic.
+ *
+ * @author Aaron Hansen
+ */
+public class DSMainNode extends DSNode {
+
+    /**
+     * The parent link or null.
+     */
+    public DSLink getLink() {
+        return (DSLink) getParent();
+    }
+
+    @Override
+    protected String getLogName() {
+        return "Main";
+    }
+
+    /**
+     * Override point, returns true by default.
+     */
+    public boolean isRequester() {
+        return true;
+    }
+
+    /**
+     * Override point, returns true by default.
+     */
+    public boolean isResponder() {
+        return true;
+    }
+
+    /**
+     * The parent must be a DSLink instance.
+     */
+    public void validateParent(DSNode node) {
+        if (node instanceof DSLink) {
+            return;
+        }
+        throw new IllegalArgumentException("Must be a child of DSLink");
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSPermissionException.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSPermissionException.java
index 1f89e710..d0ded299 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSPermissionException.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSPermissionException.java
@@ -7,44 +7,11 @@
  */
 public class DSPermissionException extends DSRequestException {
 
-    /////////////////////////////////////////////////////////////////
-    // Constructors
-    /////////////////////////////////////////////////////////////////
+    public DSPermissionException() {
+    }
 
     public DSPermissionException(String message) {
         super(message);
     }
 
-    /////////////////////////////////////////////////////////////////
-    // Methods - Public and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Protected and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Package and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Private and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes - in alphabetical order by class name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Constants - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Facets - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSRequestException.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSRequestException.java
index e42fd23b..ec0901d8 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSRequestException.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSRequestException.java
@@ -59,32 +59,4 @@ public void setDetail(Throwable arg) {
         detail = sw.toString();
     }
 
-    /////////////////////////////////////////////////////////////////
-    // Methods - Protected and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Package and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Private and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes - in alphabetical order by class name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Constants - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Facets - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSRootNode.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSRootNode.java
deleted file mode 100644
index 30525a8b..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/DSRootNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.iot.dsa.dslink;
-
-import java.util.logging.Logger;
-import org.iot.dsa.node.DSNode;
-
-/**
- * The root DSNode that triggers a link's custom functionality .  Most links will subclass this and
- * override declareDefaults() to bind their application logic.
- *
- * @author Aaron Hansen
- */
-public class DSRootNode extends DSNode {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Creates a child logger of the link.
-     */
-    protected Logger getLogger(String name) {
-        if (name.startsWith(".")) {
-            return Logger.getLogger(getLink().getLinkName() + name);
-        }
-        return Logger.getLogger(getLink().getLinkName() + '.' + name);
-    }
-
-    /**
-     * The parent link or null.
-     */
-    public DSLink getLink() {
-        return (DSLink) getParent();
-    }
-
-    /**
-     * The parent must be a DSLink instance.
-     */
-    public void validateParent(DSNode node) {
-        if (node instanceof DSLink) {
-            return;
-        }
-        throw new IllegalArgumentException("Must be a child of DSLink");
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSSysNode.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSSysNode.java
new file mode 100644
index 00000000..c93f2b60
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSSysNode.java
@@ -0,0 +1,87 @@
+package org.iot.dsa.dslink;
+
+import com.acuity.iot.dsa.dslink.protocol.v1.DS1LinkConnection;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2LinkConnection;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.action.ActionInvocation;
+import org.iot.dsa.node.action.ActionResult;
+import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.util.DSException;
+
+/**
+ * The root of the system nodes.
+ *
+ * @author Aaron Hansen
+ */
+public class DSSysNode extends DSNode {
+
+    static final String CONNECTION = "connection";
+    static final String SAVE = "save";
+    static final String STOP = "stop";
+
+    private DSInfo connection = getInfo(CONNECTION);
+    private DSInfo save = getInfo(SAVE);
+    private DSInfo stop = getInfo(STOP);
+
+    @Override
+    protected void declareDefaults() {
+        declareDefault(CONNECTION, new DSNode()).setTransient(true);
+        declareDefault(SAVE, DSAction.DEFAULT);
+        declareDefault(STOP, DSAction.DEFAULT);
+    }
+
+    public DSLinkConnection getConnection() {
+        return (DSLinkConnection) connection.getObject();
+    }
+
+    public DSLink getLink() {
+        return (DSLink) getParent();
+    }
+
+    @Override
+    protected String getLogName() {
+        return "Sys";
+    }
+
+    void init() {
+        DSLinkConfig config = getLink().getConfig();
+        try {
+            String ver = config.getDsaVersion();
+            DSLinkConnection conn;
+            String type = config.getConfig(DSLinkConfig.CFG_CONNECTION_TYPE, null);
+            if (type != null) {
+                conn = (DSLinkConnection) Class.forName(type).newInstance();
+            } else if (ver.startsWith("1")) {
+                conn = new DS1LinkConnection();
+            } else { //2
+                conn = new DS2LinkConnection();
+            }
+            fine(fine() ? "Connection type: " + conn.getClass().getName() : null);
+            put(connection, conn);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    @Override
+    public ActionResult onInvoke(DSInfo action, ActionInvocation invocation) {
+        if (action == save) {
+            getLink().save();
+        } else if (action == stop) {
+            getLink().shutdown();
+        } else {
+            super.onInvoke(action, invocation);
+        }
+        return null;
+    }
+
+    @Override
+    protected void validateParent(DSNode node) {
+        if (node instanceof DSLink) {
+            return;
+        }
+        throw new IllegalArgumentException("Invalid parent: " + node.getClass().getName());
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/DSUnsupportedException.java b/dslink-core/src/main/java/org/iot/dsa/dslink/DSUnsupportedException.java
new file mode 100644
index 00000000..a5f8ff38
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/DSUnsupportedException.java
@@ -0,0 +1,17 @@
+package org.iot.dsa.dslink;
+
+/**
+ * Indicates an unsupported method.
+ *
+ * @author Aaron Hansen
+ */
+public class DSUnsupportedException extends DSRequestException {
+
+    public DSUnsupportedException() {
+    }
+
+    public DSUnsupportedException(String message) {
+        super(message);
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/InvokeWrapper.java b/dslink-core/src/main/java/org/iot/dsa/dslink/InvokeWrapper.java
deleted file mode 100644
index 81b2cea8..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/InvokeWrapper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.iot.dsa.dslink;
-
-import org.iot.dsa.dslink.responder.InboundInvokeRequest;
-import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSMap;
-import org.iot.dsa.security.DSPermission;
-
-/**
- * Used by DSRootNode to handle an invoke request.
- *
- * @author Aaron Hansen
- */
-class InvokeWrapper implements InboundInvokeRequest {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private RequestPath path;
-    private InboundInvokeRequest request;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    InvokeWrapper(RequestPath path, InboundInvokeRequest request) {
-        this.path = path;
-        this.request = request;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void clearAllRows() {
-        request.clearAllRows();
-    }
-
-    @Override
-    public void close() {
-        request.close();
-    }
-
-    @Override
-    public void close(Exception reason) {
-        request.close(reason);
-    }
-
-    public void onClose() {
-    }
-
-    @Override
-    public DSMap getParameters() {
-        return request.getParameters();
-    }
-
-    @Override
-    public String getPath() {
-        return path.getPath();
-    }
-
-    @Override
-    public DSPermission getPermission() {
-        return request.getPermission();
-    }
-
-    @Override
-    public Integer getRequestId() {
-        return request.getRequestId();
-    }
-
-    @Override
-    public DSLinkSession getResponder() {
-        return request.getResponder();
-    }
-
-    @Override
-    public void insert(int index, DSList... rows) {
-        request.insert(index, rows);
-    }
-
-    @Override
-    public boolean isOpen() {
-        return request.isOpen();
-    }
-
-    @Override
-    public void send(DSList row) {
-        request.send(row);
-    }
-
-    @Override
-    public void replace(int idx, int len, DSList... rows) {
-        request.replace(idx, len, rows);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/ListSubscriber.java b/dslink-core/src/main/java/org/iot/dsa/dslink/ListSubscriber.java
deleted file mode 100644
index eed921e8..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/ListSubscriber.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.iot.dsa.dslink;
-
-import org.iot.dsa.dslink.responder.ApiObject;
-import org.iot.dsa.dslink.responder.InboundListRequest;
-import org.iot.dsa.dslink.responder.OutboundListResponse;
-import org.iot.dsa.node.DSIObject;
-import org.iot.dsa.node.DSIPublisher;
-import org.iot.dsa.node.DSISubscriber;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSNode;
-
-/**
- * Used by DSRootNode to subscribe to the target of a list request and update the stream when
- * changes are detected.
- *
- * @author Aaron Hansen
- */
-class ListSubscriber implements DSISubscriber, OutboundListResponse {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSInfo info;
-    private DSNode parent;
-    private InboundListRequest request;
-    private ListType subscriptionType;
-    private DSIObject target;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ListSubscriber(RequestPath path, InboundListRequest request) {
-        this.info = path.getInfo();
-        this.parent = path.getParent();
-        DSIObject obj = path.getTarget();
-        this.target = obj;
-        this.request = request;
-        if (obj instanceof DSIPublisher) {
-            ((DSIPublisher) obj).subscribe(this);
-            subscriptionType = ListType.PUBLISHER;
-        } else if (obj instanceof DSNode) {
-            ((DSNode) obj).subscribe(this);
-            subscriptionType = ListType.CONTAINER;
-        } else {
-            subscriptionType = ListType.VALUE;
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public ApiObject getTarget() {
-        return info;
-    }
-
-    @Override
-    public void onClose() {
-        switch (subscriptionType) {
-            case CONTAINER:
-                ((DSNode) target).unsubscribe(this);
-                break;
-            case PUBLISHER:
-                ((DSIPublisher) target).unsubscribe(this);
-                break;
-            default:
-                ;
-        }
-    }
-
-    @Override
-    public void onEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        switch (event) {
-            case CHILD_ADDED:
-                request.childAdded(child);
-                break;
-            case CHILD_REMOVED:
-                request.childRemoved(child);
-                break;
-            default:
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    enum ListType {
-        CONTAINER,
-        PUBLISHER,
-        VALUE,
-    }
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/ListWrapper.java b/dslink-core/src/main/java/org/iot/dsa/dslink/ListWrapper.java
deleted file mode 100644
index c2568fd9..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/ListWrapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.iot.dsa.dslink;
-
-import org.iot.dsa.dslink.responder.ApiObject;
-import org.iot.dsa.dslink.responder.InboundListRequest;
-
-/**
- * Used by DSRootNode to handle and list request.
- *
- * @author Aaron Hansen
- */
-class ListWrapper implements InboundListRequest {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private String path;
-    private InboundListRequest request;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ListWrapper(String path, InboundListRequest request) {
-        this.path = path;
-        this.request = request;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void childAdded(ApiObject obj) {
-        request.childAdded(obj);
-    }
-
-    @Override
-    public void childRemoved(ApiObject obj) {
-        request.childRemoved(obj);
-    }
-
-    @Override
-    public void close() {
-        request.close();
-    }
-
-    @Override
-    public void close(Exception reason) {
-        request.close(reason);
-    }
-
-    @Override
-    public String getPath() {
-        return path;
-    }
-
-    @Override
-    public Integer getRequestId() {
-        return request.getRequestId();
-    }
-
-    @Override
-    public DSLinkSession getResponder() {
-        return request.getResponder();
-    }
-
-    @Override
-    public boolean isOpen() {
-        return request.isOpen();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/SetWrapper.java b/dslink-core/src/main/java/org/iot/dsa/dslink/SetWrapper.java
deleted file mode 100644
index f9a04462..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/SetWrapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.iot.dsa.dslink;
-
-import org.iot.dsa.dslink.responder.InboundSetRequest;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.security.DSPermission;
-
-/**
- * Used by DSRootNode to handle a set request.
- *
- * @author Aaron Hansen
- */
-class SetWrapper implements InboundSetRequest {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private String path;
-    private InboundSetRequest request;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    SetWrapper(String path, InboundSetRequest request) {
-        this.path = path;
-        this.request = request;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public String getPath() {
-        return path;
-    }
-
-    @Override
-    public DSPermission getPermission() {
-        return request.getPermission();
-    }
-
-    @Override
-    public Integer getRequestId() {
-        return request.getRequestId();
-    }
-
-    @Override
-    public DSLinkSession getResponder() {
-        return request.getResponder();
-    }
-
-    @Override
-    public DSElement getValue() {
-        return request.getValue();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/SubscribeWrapper.java b/dslink-core/src/main/java/org/iot/dsa/dslink/SubscribeWrapper.java
deleted file mode 100644
index 13de9b61..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/SubscribeWrapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.iot.dsa.dslink;
-
-import org.iot.dsa.dslink.responder.InboundSubscribeRequest;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSStatus;
-
-/**
- * Used by DSRootNode to handle subscribe requests.
- *
- * @author Aaron Hansen
- */
-class SubscribeWrapper implements InboundSubscribeRequest {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private String path;
-    private InboundSubscribeRequest request;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    SubscribeWrapper(String path, InboundSubscribeRequest request) {
-        this.path = path;
-        this.request = request;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void close() {
-        request.close();
-    }
-
-    @Override
-    public String getPath() {
-        return path;
-    }
-
-    @Override
-    public Integer getRequestId() {
-        return request.getRequestId();
-    }
-
-    @Override
-    public DSLinkSession getResponder() {
-        return request.getResponder();
-    }
-
-    @Override
-    public Integer getSubscriptionId() {
-        return request.getSubscriptionId();
-    }
-
-    @Override
-    public void update(long timestamp, DSIValue value, DSStatus quality) {
-        request.update(timestamp, value, quality);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/ValueSubscriber.java b/dslink-core/src/main/java/org/iot/dsa/dslink/ValueSubscriber.java
deleted file mode 100644
index bd003668..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/ValueSubscriber.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.iot.dsa.dslink;
-
-import org.iot.dsa.dslink.responder.InboundSubscribeRequest;
-import org.iot.dsa.dslink.responder.SubscriptionCloseHandler;
-import org.iot.dsa.node.DSIObject;
-import org.iot.dsa.node.DSIPublisher;
-import org.iot.dsa.node.DSIPublisher.Event;
-import org.iot.dsa.node.DSIStatus;
-import org.iot.dsa.node.DSISubscriber;
-import org.iot.dsa.node.DSIValue;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSNode;
-import org.iot.dsa.node.DSStatus;
-import org.iot.dsa.node.DSString;
-
-/**
- * Used by DSRootNode to handle value subscriptions.
- *
- * @author Aaron Hansen
- */
-class ValueSubscriber implements DSISubscriber, SubscriptionCloseHandler {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSInfo info;
-    private DSNode parent;
-    private InboundSubscribeRequest request;
-    private SubscriptionType subscriptionType;
-    private DSIObject target;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ValueSubscriber(RequestPath path, InboundSubscribeRequest request) {
-        this.info = path.getInfo();
-        this.parent = path.getParent();
-        DSIObject obj = path.getTarget();
-        this.target = obj;
-        this.request = request;
-        if (info.isValue()) { //most common case here
-            parent.subscribe(this);
-            subscriptionType = SubscriptionType.VALUE;
-            onEvent(obj, info, Event.CHILD_CHANGED);
-        } else if (obj instanceof DSIPublisher) {
-            ((DSIPublisher) obj).subscribe(this);
-            subscriptionType = SubscriptionType.PUBLISHER;
-            onEvent(obj, info, Event.PUBLISHER_CHANGED);
-        } else if (obj instanceof DSNode) {
-            ((DSNode) obj).subscribe(this);
-            subscriptionType = SubscriptionType.CONTAINER;
-            onEvent(obj, info, Event.PUBLISHER_CHANGED);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public void onClose(Integer subscriptionId) {
-        switch (subscriptionType) {
-            case CONTAINER:
-                parent.unsubscribe(this);
-                break;
-            case PUBLISHER:
-                ((DSIPublisher) target).unsubscribe(this);
-                break;
-            case VALUE:
-                parent.unsubscribe(this);
-                break;
-        }
-    }
-
-    private void onContainerEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        if (event == Event.PUBLISHER_CHANGED) {
-            DSIValue value = null;
-            if (publisher instanceof DSIValue) {
-                value = (DSIValue) publisher;
-            } else {
-                value = DSString.valueOf(publisher.toString());
-            }
-            DSStatus quality = DSStatus.ok;
-            if (value instanceof DSIStatus) {
-                quality = ((DSIStatus) value).toStatus();
-            }
-            request.update(System.currentTimeMillis(), value, quality);
-        }
-    }
-
-    @Override
-    public void onEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        if (child == info) {
-            switch (subscriptionType) {
-                case CONTAINER:
-                    onContainerEvent(publisher, child, event);
-                    break;
-                case PUBLISHER:
-                    onPublisherEvent(publisher, child, event);
-                    break;
-                case VALUE:
-                    onValueEvent(publisher, child, event);
-                    break;
-            }
-        }
-    }
-
-    public void onPublisherEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        if (event == Event.PUBLISHER_CHANGED) {
-            DSIValue value = null;
-            if (publisher instanceof DSIValue) {
-                value = (DSIValue) publisher;
-            } else {
-                value = DSString.valueOf(publisher.toString());
-            }
-            DSStatus quality = DSStatus.ok;
-            if (value instanceof DSIStatus) {
-                quality = ((DSIStatus) value).toStatus();
-            }
-            request.update(System.currentTimeMillis(), value, quality);
-        }
-    }
-
-    private void onValueEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        if (event == Event.CHILD_CHANGED) {
-            DSIValue value = child.getValue();
-            DSStatus quality = DSStatus.ok;
-            if (value instanceof DSIStatus) {
-                quality = ((DSIStatus) value).toStatus();
-            }
-            request.update(System.currentTimeMillis(), value, quality);
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    enum SubscriptionType {
-        CONTAINER,
-        PUBLISHER,
-        VALUE,
-    }
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/requester/ErrorType.java b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/ErrorType.java
new file mode 100644
index 00000000..6fc7e5f4
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/ErrorType.java
@@ -0,0 +1,28 @@
+package org.iot.dsa.dslink.requester;
+
+import org.iot.dsa.dslink.DSInternalErrorException;
+import org.iot.dsa.dslink.DSPermissionException;
+import org.iot.dsa.dslink.DSRequestException;
+import org.iot.dsa.dslink.DSUnsupportedException;
+
+public enum ErrorType {
+
+    badRequest,
+    internalError,
+    notSupported,
+    permissionDenied;
+
+    public static RuntimeException makeException(ErrorType type, String message) {
+        switch (type) {
+            case badRequest:
+                return new DSRequestException(message);
+            case internalError:
+                return new DSInternalErrorException(message);
+            case notSupported:
+                return new DSUnsupportedException(message);
+            case permissionDenied:
+                return new DSPermissionException(message);
+        }
+        return new DSInternalErrorException(message);
+    }
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/requester/OutboundRequestHandler.java b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/OutboundRequestHandler.java
index cd8ecf3f..c5b2e6a9 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/requester/OutboundRequestHandler.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/OutboundRequestHandler.java
@@ -14,9 +14,9 @@ public interface OutboundRequestHandler {
     public void onClose();
 
     /**
-     * Callback for when an error is received.  If the stream is also closed, onClose will also be
-     * closed.  Does nothing by default.
+     * Callback for when an error is received.  onClose will also be called after this.
+     * Does nothing by default.
      */
-    public void onError(String type, String msg, String detail);
+    public void onError(ErrorType type, String msg);
 
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleInvokeHandler.java b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleInvokeHandler.java
new file mode 100644
index 00000000..c68cd1d6
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleInvokeHandler.java
@@ -0,0 +1,141 @@
+package org.iot.dsa.dslink.requester;
+
+import org.iot.dsa.dslink.DSRequestException;
+import org.iot.dsa.node.DSList;
+import org.iot.dsa.node.DSMap;
+
+/**
+ * Action handler for non-tables/streams.
+ * <p>
+ * Call getResult(long timeout) to block until the invocation is complete. It will either return
+ * the result (possibly null), or throw an exception.
+ *
+ * @author Aaron Hansen
+ */
+public class SimpleInvokeHandler extends AbstractInvokeHandler {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private boolean autoClose = true;
+    private boolean closed = false;
+    private RuntimeException error;
+    private DSList result;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Waits for the stream to close before returning, or the timeout to occur.
+     *
+     * @param timeout Passed to Object.wait
+     * @return Null, or the first update.
+     * @throws RuntimeException if there is a timeout, or if there are any errors.
+     */
+    public DSList getResult(long timeout) {
+        synchronized (this) {
+            if (!closed) {
+                try {
+                    wait(timeout);
+                } catch (Exception x) {
+                }
+            }
+        }
+        if (error != null) {
+            throw error;
+        }
+        if (!closed) {
+            throw new IllegalStateException("Action timed out");
+        }
+        return result;
+    }
+
+    /**
+     * True by default, whether or not to close the stream upon receiving the first result.
+     */
+    public boolean isAutoClose() {
+        return autoClose;
+    }
+
+    /**
+     * Causes getResult to return.
+     */
+    public void onClose() {
+        synchronized (this) {
+            closed = true;
+            notifyAll();
+        }
+    }
+
+    /**
+     * Will create an exception to be thrown by getResult.
+     */
+    public void onError(ErrorType type, String msg) {
+        synchronized (this) {
+            error = ErrorType.makeException(type, msg);
+            getStream().closeStream();
+            notifyAll();
+        }
+    }
+
+    /**
+     * Does nothing.
+     */
+    public void onColumns(DSList list) {
+    }
+
+    /**
+     * Will result in an error since tables and streams are not supported.
+     */
+    public void onInsert(int index, DSList rows) {
+        synchronized (this) {
+            error = new DSRequestException("Tables and streams not supported");
+            getStream().closeStream();
+            notifyAll();
+        }
+    }
+
+    /**
+     * Does nothing.
+     */
+    public void onMode(Mode mode) {
+    }
+
+    /**
+     * Will result in an error since tables and streams are not supported.
+     */
+    public void onReplace(int start, int end, DSList rows) {
+        synchronized (this) {
+            error = new DSRequestException("Tables and streams not supported");
+            getStream().closeStream();
+            notifyAll();
+        }
+    }
+
+    public void onTableMeta(DSMap map) {
+    }
+
+    /**
+     * Captures the result and if auto-close is true, closes the stream.
+     */
+    public void onUpdate(DSList row) {
+        synchronized (this) {
+            result = row;
+            if (autoClose) {
+                getStream().closeStream();
+            }
+        }
+    }
+
+    /**
+     * Whether or not to auto close the stream on the first update.  True by default, this
+     * only needs to be called to disable.
+     */
+    public SimpleInvokeHandler setAutoClose(boolean arg) {
+        autoClose = arg;
+        return this;
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleRequestHandler.java b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleRequestHandler.java
index baa02104..4e937014 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleRequestHandler.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/requester/SimpleRequestHandler.java
@@ -31,7 +31,7 @@ public void onClose() {
      * {@inheritDoc}
      */
     @Override
-    public void onError(String type, String msg, String detail) {
+    public void onError(ErrorType type, String msg) {
     }
 
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/responder/ApiObject.java b/dslink-core/src/main/java/org/iot/dsa/dslink/responder/ApiObject.java
index 56dbff5e..90182d99 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/responder/ApiObject.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/responder/ApiObject.java
@@ -22,10 +22,7 @@ public interface ApiObject {
      */
     public Iterator<ApiObject> getChildren();
 
-    /**
-     * Add any meta-data for the object to the given map.
-     */
-    public void getMetadata(DSMap metadata);
+    public void getMetadata(DSMap bucket);
 
     /**
      * The display name.
@@ -50,7 +47,7 @@ public interface ApiObject {
     /**
      * Whether or not this object requires configuration permission to read/write.
      */
-    public boolean isConfig();
+    public boolean isAdmin();
 
     /**
      * True if the object should ignored (not be exposed through the api).
diff --git a/dslink-core/src/main/java/org/iot/dsa/dslink/responder/InboundRequest.java b/dslink-core/src/main/java/org/iot/dsa/dslink/responder/InboundRequest.java
index 9924d3a2..5fb91581 100644
--- a/dslink-core/src/main/java/org/iot/dsa/dslink/responder/InboundRequest.java
+++ b/dslink-core/src/main/java/org/iot/dsa/dslink/responder/InboundRequest.java
@@ -1,7 +1,5 @@
 package org.iot.dsa.dslink.responder;
 
-import org.iot.dsa.dslink.DSLinkSession;
-
 /**
  * Common to all incoming requests.
  *
@@ -19,10 +17,4 @@ public interface InboundRequest {
      */
     public Integer getRequestId();
 
-    /**
-     * The corresponding session.
-     */
-    public DSLinkSession getResponder();
-
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/AbstractReader.java b/dslink-core/src/main/java/org/iot/dsa/io/AbstractReader.java
index e56d0b42..f9ffd49f 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/AbstractReader.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/AbstractReader.java
@@ -1,6 +1,5 @@
 package org.iot.dsa.io;
 
-import org.iot.dsa.node.DSBytes;
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/AbstractWriter.java b/dslink-core/src/main/java/org/iot/dsa/io/AbstractWriter.java
index e7668de3..60cf295b 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/AbstractWriter.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/AbstractWriter.java
@@ -2,7 +2,6 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import org.iot.dsa.node.DSBytes;
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
@@ -47,6 +46,11 @@ public abstract class AbstractWriter implements Closeable, DSIWriter {
 
     @Override
     public AbstractWriter beginList() {
+        return beginList(-1);
+    }
+
+    @Override
+    public AbstractWriter beginList(int size) {
         try {
             switch (last) {
                 case LAST_MAP:
@@ -61,7 +65,7 @@ public AbstractWriter beginList() {
                         writeNewLineIndent();
                     }
             }
-            writeListStart();
+            writeListStart(size);
             last = LAST_LIST;
             depth++;
         } catch (IOException x) {
@@ -72,6 +76,11 @@ public AbstractWriter beginList() {
 
     @Override
     public AbstractWriter beginMap() {
+        return beginMap(-1);
+    }
+
+    @Override
+    public AbstractWriter beginMap(int size) {
         try {
             switch (last) {
                 case LAST_MAP:
@@ -86,7 +95,7 @@ public AbstractWriter beginMap() {
                         writeNewLineIndent();
                     }
             }
-            writeMapStart();
+            writeMapStart(size);
             last = LAST_MAP;
             depth++;
         } catch (IOException x) {
@@ -171,6 +180,13 @@ public AbstractWriter key(CharSequence arg) {
         return this;
     }
 
+    /**
+     * Returns 0 by default.
+     */
+    public int length() {
+        return 0;
+    }
+
     @Override
     public AbstractWriter reset() {
         depth = 0;
@@ -194,16 +210,16 @@ public AbstractWriter value(DSElement arg) {
                 value(arg.toLong());
                 break;
             case LIST:
-                beginList();
                 DSList list = arg.toList();
+                beginList(list.size());
                 for (int i = 0, len = list.size(); i < len; i++) {
                     value(list.get(i));
                 }
                 endList();
                 break;
             case MAP:
-                beginMap();
                 DSMap map = arg.toMap();
+                beginMap(map.size());
                 Entry e;
                 for (int i = 0, len = map.size(); i < len; i++) {
                     e = map.getEntry(i);
@@ -230,8 +246,8 @@ public AbstractWriter value(boolean arg) {
             switch (last) {
                 case LAST_DONE:
                     throw new IllegalStateException("Nesting error: " + arg);
-                case LAST_INIT:
-                    throw new IllegalStateException("Not expecting value: " + arg);
+                    //case LAST_INIT:
+                    //throw new IllegalStateException("Not expecting value: " + arg);
                 case LAST_VAL:
                 case LAST_END:
                     writeSeparator();
@@ -258,8 +274,8 @@ public AbstractWriter value(byte[] arg) {
             switch (last) {
                 case LAST_DONE:
                     throw new IllegalStateException("Nesting error");
-                case LAST_INIT:
-                    throw new IllegalStateException("Not expecting byte[] value");
+                    //case LAST_INIT:
+                    //throw new IllegalStateException("Not expecting byte[] value");
                 case LAST_VAL:
                 case LAST_END:
                     writeSeparator();
@@ -286,8 +302,8 @@ public AbstractWriter value(double arg) {
             switch (last) {
                 case LAST_DONE:
                     throw new IllegalStateException("Nesting error: " + arg);
-                case LAST_INIT:
-                    throw new IllegalStateException("Not expecting value: " + arg);
+                    //case LAST_INIT:
+                    //throw new IllegalStateException("Not expecting value: " + arg);
                 case LAST_VAL:
                 case LAST_END:
                     writeSeparator();
@@ -314,8 +330,8 @@ public AbstractWriter value(int arg) {
             switch (last) {
                 case LAST_DONE:
                     throw new IllegalStateException("Nesting error: " + arg);
-                case LAST_INIT:
-                    throw new IllegalStateException("Not expecting value: " + arg);
+                    //case LAST_INIT:
+                    //throw new IllegalStateException("Not expecting value: " + arg);
                 case LAST_VAL:
                 case LAST_END:
                     writeSeparator();
@@ -342,8 +358,8 @@ public AbstractWriter value(long arg) {
             switch (last) {
                 case LAST_DONE:
                     throw new IllegalStateException("Nesting error: " + arg);
-                case LAST_INIT:
-                    throw new IllegalStateException("Not expecting value: " + arg);
+                    //case LAST_INIT:
+                    //throw new IllegalStateException("Not expecting value: " + arg);
                 case LAST_VAL:
                 case LAST_END:
                     writeSeparator();
@@ -370,8 +386,8 @@ public AbstractWriter value(String arg) {
             switch (last) {
                 case LAST_DONE:
                     throw new IllegalStateException("Nesting error: " + arg);
-                case LAST_INIT:
-                    throw new IllegalStateException("Not expecting value: " + arg);
+                    //case LAST_INIT:
+                    //throw new IllegalStateException("Not expecting value: " + arg);
                 case LAST_VAL:
                 case LAST_END:
                     writeSeparator();
@@ -434,7 +450,7 @@ public AbstractWriter value(String arg) {
     /**
      * Start a new list.
      */
-    protected abstract void writeListStart() throws IOException;
+    protected abstract void writeListStart(int size) throws IOException;
 
     /**
      * End the current map.
@@ -444,7 +460,7 @@ public AbstractWriter value(String arg) {
     /**
      * Start a new map.
      */
-    protected abstract void writeMapStart() throws IOException;
+    protected abstract void writeMapStart(int size) throws IOException;
 
     /**
      * Override point for subclasses which perform use pretty printing, such as json. Does nothing
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/DSBase64.java b/dslink-core/src/main/java/org/iot/dsa/io/DSBase64.java
index a3e14254..c91246a7 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/DSBase64.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/DSBase64.java
@@ -6,7 +6,7 @@
 
 /**
  * Thread-safe Base64 encoder and decoder.  This only exists because we need to be compatible with
- * Java 6.  While not an exact copy, it borrows heavily from the Java 8 implementation.
+ * Java 6.
  */
 public class DSBase64 {
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/DSByteBuffer.java b/dslink-core/src/main/java/org/iot/dsa/io/DSByteBuffer.java
deleted file mode 100644
index 0178b024..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/io/DSByteBuffer.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package org.iot.dsa.io;
-
-/**
- * A buffer for storing bytes being pushed from an input stream.  Useful when bytes are coming in
- * faster than can be processed.
- *
- * @author Aaron Hansen
- */
-public class DSByteBuffer {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private byte[] buffer;
-    private int length = 0;
-    private int offset = 0;
-    private boolean open = false;
-    private long timeout = 60000;
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Constructors
-    /////////////////////////////////////////////////////////////////
-
-    public DSByteBuffer() {
-        this(8192);
-    }
-
-    public DSByteBuffer(int initialCapacity) {
-        buffer = new byte[initialCapacity];
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /**
-     * The number of bytes available for reading.
-     */
-    public int available() {
-        return length;
-    }
-
-    /**
-     * Important for notifying waiting threads.
-     */
-    public synchronized DSByteBuffer close() {
-        if (!open) {
-            return this;
-        }
-        open = false;
-        notify();
-        return this;
-    }
-
-    /**
-     * Number of millis the read methods will block before throwing an IOException.
-     *
-     * @return Zero or less is indefinite.
-     */
-    public long getTimeout() {
-        return timeout;
-    }
-
-    /**
-     * Increases the childCount of the buffer to at least the given.
-     */
-    private void growBuffer(int minSize) {
-        int size = buffer.length;
-        while (size < minSize) {
-            size *= 2;
-        }
-        byte[] tmp = new byte[size];
-        System.arraycopy(buffer, offset, tmp, 0, length);
-        buffer = tmp;
-        offset = 0;
-    }
-
-    public boolean isOpen() {
-        return open;
-    }
-
-    public int length() {
-        return length;
-    }
-
-    public synchronized DSByteBuffer open() {
-        if (open) {
-            return this;
-        }
-        open = true;
-        notify();
-        return this;
-    }
-
-    /**
-     * Add the byte to the buffer for reading.
-     */
-    public synchronized void put(byte b) {
-        if (!open) {
-            throw new IllegalStateException("Buffer closed");
-        }
-        int bufLen = buffer.length;
-        int msgLen = 1;
-        if ((msgLen + length + offset) >= bufLen) {
-            if ((msgLen + length) > bufLen) {
-                growBuffer(msgLen + length);
-            } else { //offset must be > 0
-                System.arraycopy(buffer, offset, buffer, 0, length);
-                offset = 0;
-            }
-        }
-        buffer[length + offset] = b;
-        length++;
-        notify();
-    }
-
-    /**
-     * Add bytes to the buffer for reading.
-     *
-     * @param msg The data source.
-     */
-    public synchronized void put(byte[] msg) {
-        put(msg, 0, msg.length);
-    }
-
-    /**
-     * Add bytes to the buffer for reading.
-     *
-     * @param msg The data source.
-     * @param off The start offset in the buffer to put data.
-     * @param len The maximum number of bytes to read.
-     */
-    public synchronized void put(byte[] msg, int off, int len) {
-        if (!open) {
-            throw new IllegalStateException("Buffer closed");
-        }
-        int bufLen = buffer.length;
-        if ((len + length + offset) >= bufLen) {
-            if ((len + length) > bufLen) {  //the buffer is too small
-                growBuffer(len + length);
-            } else { //offset must be > 0, shift everything to index 0
-                System.arraycopy(buffer, offset, buffer, 0, length);
-                offset = 0;
-            }
-        }
-        System.arraycopy(msg, off, buffer, length + offset, len);
-        length += len;
-        notify();
-    }
-
-    /**
-     * Overwrite bytes in the internal buffer (which begins at index 0).
-     *
-     * @param dest The internal destination offset.
-     * @param msg  The data source.
-     * @param off  The start offset in the msg to put data.
-     * @param len  The maximum number of bytes to read.
-     */
-    public synchronized void put(int dest, byte[] msg, int off, int len) {
-        if (!open) {
-            throw new IllegalStateException("Buffer closed");
-        }
-        if (offset > 0) {
-            System.arraycopy(buffer, offset, buffer, 0, length);
-            offset = 0;
-        }
-        int newLen = dest + len;
-        if (newLen >= buffer.length) {
-            growBuffer(newLen);
-        }
-        System.arraycopy(msg, off, buffer, dest, len);
-        if (newLen > length) {
-            length = newLen;
-        }
-        if ((dest + len) > length) {
-            length += len;
-        }
-        notify();
-    }
-
-    /**
-     * Returns the nextRun incoming byte, or -1 when end of stream has been reached.
-     *
-     * @throws DSIoException if there are any issues.
-     */
-    public synchronized int read() {
-        while (open && (length == 0)) {
-            try {
-                if (timeout > 0) {
-                    wait(timeout);
-                } else {
-                    wait();
-                }
-            } catch (InterruptedException ignore) {
-            }
-        }
-        notify();
-        if (!open) {
-            return -1;
-        } else if (length == 0) {
-            throw new DSIoException("Read timeout");
-        }
-        int ret = buffer[offset];
-        offset++;
-        length--;
-        return ret;
-    }
-
-    /**
-     * Reads incoming bytes into the given buffer.
-     *
-     * @param buf The buffer into which data is read.
-     * @param off The start offset in the buffer to put data.
-     * @param len The maximum number of bytes to read.
-     * @return The number of bytes read or -1 for end of stream.
-     * @throws DSIoException if there are any issues.
-     */
-    public synchronized int read(byte[] buf, int off, int len) {
-        while (open && (length == 0)) {
-            try {
-                if (timeout > 0) {
-                    wait(timeout);
-                } else {
-                    wait();
-                }
-            } catch (InterruptedException ignore) {
-            }
-        }
-        notify();
-        if (!open) {
-            return -1;
-        } else if (length == 0) {
-            throw new DSIoException("Read timeout");
-        }
-        len = Math.min(len, length);
-        System.arraycopy(buffer, offset, buf, off, len);
-        length -= len;
-        if (length == 0) {
-            offset = 0;
-        } else {
-            offset += len;
-        }
-        return len;
-    }
-
-    /**
-     * Number of millis the read methods will block before throwing an DSIoException.
-     *
-     * @param timeout Zero or less for indefinite.
-     * @return This
-     */
-    public DSByteBuffer setTimeout(long timeout) {
-        this.timeout = timeout;
-        return this;
-    }
-
-    /**
-     * Returns a new array.
-     */
-    public byte[] toByteArray() {
-        byte[] ret = new byte[length];
-        read(ret, 0, length);
-        return ret;
-    }
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/DSIWriter.java b/dslink-core/src/main/java/org/iot/dsa/io/DSIWriter.java
index d4188ff7..33fd0440 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/DSIWriter.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/DSIWriter.java
@@ -48,6 +48,14 @@ public interface DSIWriter extends Closeable {
      */
     public DSIWriter beginList();
 
+    /**
+     * Start a new list of the given size and return this.
+     *
+     * @param size Less than zero means the size is unknown.
+     * @throws IllegalStateException when improperly called.
+     */
+    public DSIWriter beginList(int size);
+
     /**
      * Start a new map and return this.
      *
@@ -55,6 +63,14 @@ public interface DSIWriter extends Closeable {
      */
     public DSIWriter beginMap();
 
+    /**
+     * Start a new map of the given size and return this.
+     *
+     * @param size Less than zero means the size is unknown.
+     * @throws IllegalStateException when improperly called.
+     */
+    public DSIWriter beginMap(int size);
+
     /**
      * Close the stream. IOExceptions will be wrapped in runtime exceptions.
      */
@@ -87,6 +103,11 @@ public interface DSIWriter extends Closeable {
      */
     public DSIWriter key(CharSequence key);
 
+    /**
+     * If the writer is buffering output, this returns the size of that buffer.
+     */
+    public int length();
+
     /**
      * Clears the state of the writer.
      */
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/NodeDecoder.java b/dslink-core/src/main/java/org/iot/dsa/io/NodeDecoder.java
index 8688ebb4..2eade2aa 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/NodeDecoder.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/NodeDecoder.java
@@ -4,6 +4,7 @@
 import org.iot.dsa.io.DSIReader.Token;
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSIObject;
+import org.iot.dsa.node.DSIStorable;
 import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSNode;
@@ -22,10 +23,6 @@
  */
 public class NodeDecoder {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
@@ -129,12 +126,16 @@ private void readChild(DSNode parent) {
                     throw new IllegalStateException("Missing name");
                 }
                 DSIObject obj = null;
-                if (info != null) {
-                    obj = info.getObject();
-                }
                 if (type != null) {
                     obj = getInstance(type);
-                    info = parent.put(name, obj);
+                    if (info == null) {
+                        info = parent.put(name, obj);
+                    } else {
+                        parent.put(info, obj);
+                    }
+                }
+                if ((info != null) && (obj == null)) {
+                    obj = info.getObject();
                 }
                 if (obj == null) { //dynamic, or declareDefaults was modified
                     in.next();
@@ -145,7 +146,11 @@ private void readChild(DSNode parent) {
                 } else {
                     in.next();
                     DSIValue val = (DSIValue) obj;
-                    parent.put(info, val.restore(in.getElement()));
+                    if (val instanceof DSIStorable) {
+                        parent.put(info, ((DSIStorable) val).restore(in.getElement()));
+                    } else {
+                        parent.put(info, val.valueOf(in.getElement()));
+                    }
                 }
                 if (state != null) {
                     info.decodeState(state);
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/NodeEncoder.java b/dslink-core/src/main/java/org/iot/dsa/io/NodeEncoder.java
index 3dbe1b92..71b47e76 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/NodeEncoder.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/NodeEncoder.java
@@ -4,8 +4,10 @@
 import org.iot.dsa.io.json.AbstractJsonWriter;
 import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSIObject;
+import org.iot.dsa.node.DSIStorable;
 import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 
 /**
@@ -21,16 +23,13 @@
  */
 public class NodeEncoder {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
     private int nextToken = 1;
     private DSIWriter out;
+    private DSMap cacheMap;
     private HashMap<Class, String> classMap = new HashMap<Class, String>();
 
     ///////////////////////////////////////////////////////////////////////////
@@ -123,7 +122,7 @@ void writeChildren(DSNode arg) {
                     writeObject(info);
                 }
             } catch (IndexOutOfBoundsException x) {
-                //TODO log a fine - modified during save which is okay.
+                arg.trace(arg.getPath(), x);
             }
             info = info.next();
         }
@@ -176,22 +175,19 @@ void writeValue(DSInfo arg) {
         if (!arg.equalsDefaultState()) {
             out.key("i").value(arg.encodeState());
         }
+        DSIValue v = (DSIValue) arg.getObject();
+        if (v == null) {
+            out.key("v").value((String) null);
+            return;
+        }
         if (!arg.equalsDefaultType()) {
-            DSIValue v = (DSIValue) arg.getObject();
-            if (v != null) {
-                if (!(v instanceof DSElement)) {
-                    out.key("t").value(getToken(v));
-                }
-                out.key("v").value(v.store());
-            } else {
-                out.key("v").value((String) null);
-            }
-        } else if (!arg.equalsDefaultValue()) {
-            DSIValue v = (DSIValue) arg.getObject();
-            if (v != null) {
-                out.key("v").value(v.store());
+            out.key("t").value(getToken(v));
+        }
+        if (!arg.equalsDefaultValue()) {
+            if (v instanceof DSIStorable) {
+                out.key("v").value(((DSIStorable) v).store());
             } else {
-                out.key("v").value((String) null);
+                out.key("v").value(v.toElement());
             }
         }
         out.endMap();
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/json/AbstractJsonWriter.java b/dslink-core/src/main/java/org/iot/dsa/io/json/AbstractJsonWriter.java
index e66bff1e..bc90f51e 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/json/AbstractJsonWriter.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/json/AbstractJsonWriter.java
@@ -129,7 +129,7 @@ protected void writeListEnd() throws IOException {
     }
 
     @Override
-    protected void writeListStart() throws IOException {
+    protected void writeListStart(int size) throws IOException {
         append('[');
     }
 
@@ -139,7 +139,7 @@ protected void writeMapEnd() throws IOException {
     }
 
     @Override
-    protected void writeMapStart() throws IOException {
+    protected void writeMapStart(int size) throws IOException {
         append('{');
     }
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/json/JsonReader.java b/dslink-core/src/main/java/org/iot/dsa/io/json/JsonReader.java
index adda84da..9960956d 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/json/JsonReader.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/json/JsonReader.java
@@ -1,8 +1,9 @@
 package org.iot.dsa.io.json;
 
+import java.io.BufferedInputStream;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -193,9 +194,9 @@ public JsonReader setInput(CharSequence in) {
     public JsonReader setInput(File file) {
         try {
             if (in instanceof JsonInput) {
-                ((JsonInput) in).setInput(new FileReader(file));
+                ((JsonInput) in).setInput(new BufferedInputStream(new FileInputStream(file)));
             } else {
-                in = new JsonInput(new FileReader(file));
+                in = new JsonInput(new BufferedInputStream(new FileInputStream(file)));
             }
         } catch (Exception x) {
             throw new IllegalStateException(x);
@@ -329,7 +330,7 @@ private void readString() throws IOException {
                 ch = (char) in.read();
                 switch (ch) {
                     case 'u':
-                    case 'U' :
+                    case 'U':
                         ch = readUnicode();
                         break;
                     case 'b':
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/json/JsonWriter.java b/dslink-core/src/main/java/org/iot/dsa/io/json/JsonWriter.java
index 8a067a20..7e24791f 100644
--- a/dslink-core/src/main/java/org/iot/dsa/io/json/JsonWriter.java
+++ b/dslink-core/src/main/java/org/iot/dsa/io/json/JsonWriter.java
@@ -31,7 +31,6 @@ public class JsonWriter extends AbstractJsonWriter {
     private char[] buf = new char[BUF_SIZE];
     private int buflen = 0;
     private Writer out;
-    private boolean zip = false;
     private ZipOutputStream zout;
 
     // Constructors
@@ -71,6 +70,13 @@ public JsonWriter(OutputStream out, String zipFileName) {
         setOutput(out, zipFileName);
     }
 
+    public JsonWriter(Writer out) {
+        setOutput(out);
+    }
+
+    // Public Methods
+    // --------------
+
     @Override
     public void close() {
         try {
@@ -84,10 +90,8 @@ public void close() {
                 } catch (Exception x) {
                 }
                 zout.close();
-                zout = null;
-            } else {
-                out.close();
             }
+            out.close();
         } catch (IOException x) {
             throw new RuntimeException(x);
         }
@@ -140,7 +144,6 @@ public JsonWriter setOutput(File file, String zipFileName) {
             zout = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
             zout.putNextEntry(new ZipEntry(zipFileName));
             this.out = new OutputStreamWriter(zout);
-            this.zip = true;
         } catch (IOException x) {
             throw new RuntimeException(x);
         }
@@ -169,10 +172,9 @@ public JsonWriter setOutput(OutputStream out, String zipFileName) {
             if (zipFileName == null) {
                 throw new NullPointerException();
             }
-            ZipOutputStream zout = new ZipOutputStream(out);
+            zout = new ZipOutputStream(out);
             zout.putNextEntry(new ZipEntry(zipFileName));
             this.out = new OutputStreamWriter(zout);
-            this.zip = true;
         } catch (IOException x) {
             throw new RuntimeException(x);
         }
diff --git a/dslink-core/src/main/java/org/iot/dsa/io/package-info.java b/dslink-core/src/main/java/org/iot/dsa/io/package-info.java
new file mode 100644
index 00000000..ae97c254
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/io/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Node serialization and streaming abstraction for JSON and MsgPack.
+ *
+ * @author Aaron Hansen
+ */
+package org.iot.dsa.io;
+
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/AsyncLogHandler.java b/dslink-core/src/main/java/org/iot/dsa/logging/AsyncLogHandler.java
index bb55a7b9..3724bd07 100644
--- a/dslink-core/src/main/java/org/iot/dsa/logging/AsyncLogHandler.java
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/AsyncLogHandler.java
@@ -15,12 +15,16 @@
  *
  * @author Aaron Hansen
  */
-public abstract class AsyncLogHandler extends Handler {
+public abstract class AsyncLogHandler extends Handler implements DSILevels {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////////
 
+    static final int STATE_CLOSED = 0;
+    static final int STATE_OPEN = 1;
+    static final int STATE_CLOSE_PENDING = 2;
+
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
@@ -29,39 +33,38 @@ public abstract class AsyncLogHandler extends Handler {
     private Calendar calendar = Calendar.getInstance();
     private LogHandlerThread logHandlerThread;
     private int maxQueueSize = DSLogging.DEFAULT_MAX_QUEUE;
-    private boolean open = false;
     private PrintStream out;
+    private int state = STATE_CLOSED;
     private LinkedList<LogRecord> queue = new LinkedList<LogRecord>();
     private int queueThrottle = (int) (DSLogging.DEFAULT_MAX_QUEUE * .90);
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
-    /**
-     * The number of items on the queue.
-     */
-    public int backlog() {
-        synchronized (queue) {
-            return queue.size();
-        }
-    }
-
     /**
      * Closes the PrintStream, terminates the write thread and performs houseKeeping.
      */
     @Override
     public void close() {
-        open = false;
+        synchronized (this) {
+            if (state != STATE_OPEN) {
+                return;
+            }
+            state = STATE_CLOSE_PENDING;
+        }
         synchronized (queue) {
-            queue.notifyAll();
+            while (queue.size() > 0) {
+                queue.notifyAll();
+                try {
+                    queue.wait();
+                } catch (Exception ignore) {
+                }
+            }
         }
         houseKeeping();
-        out.close();
+        out.flush();
+        state = STATE_CLOSED;
     }
 
     @Override
@@ -77,10 +80,6 @@ public long getHouseKeepingIntervalMillis() {
         return DSTime.MILLIS_TEN_SECONDS;
     }
 
-    public int getMaxQueueSize() {
-        return maxQueueSize;
-    }
-
     /**
      * The sink for formatted messages.
      */
@@ -106,7 +105,7 @@ protected void houseKeeping() {
      */
     @Override
     public void publish(LogRecord record) {
-        if (open) {
+        if (state == STATE_OPEN) {
             if (maxQueueSize > 0) {
                 int size = queue.size();
                 if (size >= queueThrottle) {
@@ -194,12 +193,35 @@ protected AsyncLogHandler setOut(PrintStream out) {
      */
     protected void start() {
         if (logHandlerThread == null) {
-            open = true;
+            state = STATE_OPEN;
             logHandlerThread = new LogHandlerThread();
             logHandlerThread.start();
         }
     }
 
+    private String toString(Level level) {
+        switch (level.intValue()) {
+            case TRACE: //finest
+                return "Trace";
+            case DEBUG: //finer
+                return "Debug";
+            case FINE: //fine
+            case CONFIG: //config
+                return "Fine ";
+            case WARN: //custom
+                return "Warn ";
+            case INFO: //info
+                return "Info ";
+            case ERROR: //warn
+                return "Error";
+            case ADMIN: //custom
+                return "Admin";
+            case FATAL: //severe
+                return "Fatal";
+        }
+        return level.getLocalizedName();
+    }
+
     /**
      * Formats and writes the logging record the underlying stream.
      */
@@ -209,34 +231,39 @@ protected void write(LogRecord record) {
             out.println(formatter.format(record));
             return;
         }
+        // severity
+        builder.append('[').append(toString(record.getLevel())).append(' ');
         // timestamp
         calendar.setTimeInMillis(record.getMillis());
         DSTime.encodeForLogs(calendar, builder);
+        builder.append(']');
         // log name
-        builder.append(" [");
-        builder.append(record.getLoggerName());
-        builder.append("] ");
-        // severity
-        builder.append(record.getLevel().getLocalizedName());
+        String name = record.getLoggerName();
+        if ((name != null) && !name.isEmpty()) {
+            builder.append("[");
+            builder.append(record.getLoggerName());
+            builder.append(']');
+        } else {
+            builder.append("[Default]");
+        }
         // class
         if (record.getSourceClassName() != null) {
-            builder.append(" - ");
             builder.append(record.getSourceClassName());
+            builder.append(" - ");
         }
         // method
         if (record.getSourceMethodName() != null) {
-            builder.append(" - ");
             builder.append(record.getSourceMethodName());
+            builder.append(" - ");
         }
         // message
         String msg = record.getMessage();
         if ((msg != null) && (msg.length() > 0)) {
             Object[] params = record.getParameters();
-            if (params != null) {
+            if ((params != null) && (params.length > 0)) {
                 msg = String.format(msg, params);
             }
-            builder.append(" - ");
-            builder.append(msg);
+            builder.append(' ').append(msg);
         }
         out.println(builder.toString());
         builder.setLength(0);
@@ -262,51 +289,56 @@ public void run() {
             long lastHouseKeeping = System.nanoTime();
             long now;
             LogRecord record;
-            boolean emptyQueue;
-            while (open) {
+            boolean emptyQueue = false;
+            while (state != STATE_CLOSED) {
                 record = null;
                 synchronized (queue) {
                     emptyQueue = queue.isEmpty();
                     if (emptyQueue) {
                         try {
-                            queue.wait(DSTime.MILLIS_SECOND);
+                            queue.notifyAll();
                         } catch (Exception ignore) {
                         }
+                        if (state == STATE_OPEN) {
+                            try {
+                                queue.wait(DSTime.MILLIS_SECOND);
+                            } catch (Exception ignore) {
+                            }
+                        }
                         emptyQueue = queue.isEmpty(); //housekeeping opportunity flag
-                    } else {
+                    } else if (!emptyQueue) {
                         record = queue.removeFirst();
                     }
                 }
-                if (open) {
+                if (state != STATE_CLOSED) {
                     if (record != null) {
                         write(record);
-                        Thread.yield();
                     }
-                    if (emptyQueue) {
-                        //housekeeping opportunity
-                        now = System.currentTimeMillis();
-                        long min = getHouseKeepingIntervalMillis() / 2;
-                        if ((now - lastHouseKeeping) > min) {
-                            flush();
-                            houseKeeping();
-                            lastHouseKeeping = System.nanoTime();
-                        }
-                    } else {
-                        now = System.currentTimeMillis();
-                        if ((now - lastHouseKeeping) > getHouseKeepingIntervalMillis()) {
-                            flush();
-                            houseKeeping();
-                            lastHouseKeeping = System.nanoTime();
+                    if (state == STATE_OPEN) {
+                        if (emptyQueue) {
+                            //housekeeping opportunity
+                            now = System.currentTimeMillis();
+                            long min = getHouseKeepingIntervalMillis() / 2;
+                            if ((now - lastHouseKeeping) > min) {
+                                flush();
+                                houseKeeping();
+                                lastHouseKeeping = System.nanoTime();
+                            }
+                        } else {
+                            now = System.currentTimeMillis();
+                            if ((now - lastHouseKeeping) > getHouseKeepingIntervalMillis()) {
+                                flush();
+                                houseKeeping();
+                                lastHouseKeeping = System.nanoTime();
+                            }
                         }
                     }
                 }
             }
+            flush();
             logHandlerThread = null;
         }
-    }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
+    } //LogHandlerThread
 
-} //class
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/DSILevels.java b/dslink-core/src/main/java/org/iot/dsa/logging/DSILevels.java
new file mode 100644
index 00000000..687d73d9
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/DSILevels.java
@@ -0,0 +1,30 @@
+package org.iot.dsa.logging;
+
+import java.util.logging.Level;
+
+public interface DSILevels {
+
+    int TRACE = 300; //finest
+    int DEBUG = 400; //finer
+    int FINE = 500; //fine
+    int CONFIG = 700; //config
+    int WARN = 750; //custom
+    int INFO = 800; //info
+    int ERROR = 900; //warning
+    int ADMIN = 950; //custom
+    int FATAL = 1000; //severe
+
+    Level all = Level.ALL;
+    Level trace = Level.FINEST;
+    Level debug = Level.FINER;
+    Level fine = Level.FINE;
+    Level warn = new DSLevel("Warn", WARN);
+    Level info = Level.INFO;
+    Level error = Level.WARNING;
+    Level admin = new DSLevel("Admin", ADMIN);
+    Level fatal = Level.SEVERE;
+    Level off = Level.OFF;
+
+}
+
+
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/DSLevel.java b/dslink-core/src/main/java/org/iot/dsa/logging/DSLevel.java
new file mode 100644
index 00000000..84b8d8c6
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/DSLevel.java
@@ -0,0 +1,11 @@
+package org.iot.dsa.logging;
+
+import java.util.logging.Level;
+
+class DSLevel extends Level {
+
+    DSLevel(String name, int value) {
+        super(name, value);
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/DSLogger.java b/dslink-core/src/main/java/org/iot/dsa/logging/DSLogger.java
index 539b8bd8..5b8157b7 100644
--- a/dslink-core/src/main/java/org/iot/dsa/logging/DSLogger.java
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/DSLogger.java
@@ -1,17 +1,19 @@
 package org.iot.dsa.logging;
 
-import static java.util.logging.Level.CONFIG;
-import static java.util.logging.Level.FINE;
-import static java.util.logging.Level.FINER;
-import static java.util.logging.Level.FINEST;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.SEVERE;
-import static java.util.logging.Level.WARNING;
-
 import java.util.logging.Logger;
 
 /**
- * Adds a convenience layer to Java Util Logging.
+ * Adds an abstraction layer on Java Util Logging for two purposes:
+ *
+ * <ul>
+ *
+ * <li>To use the DSA levels.
+ *
+ * <li>So JUL can be replaced with other logging frameworks if desired.
+ *
+ * </ul>
+ *
+ * This has methods that enables conditional logging (most efficient) using ternary statements.
  *
  * <p>
  *
@@ -20,9 +22,8 @@
  * <pre>
  *
  * {@code
- * if (myLogger.isLoggable(Level.FINE) {
- *   myLogger.fine(someMessage());
- * }
+ * if (myLogger.isLoggable(Level.INFO))
+ *     myLogger.info(someMessage());
  * }
  *
  * </pre>
@@ -32,184 +33,218 @@
  * <pre>
  *
  * {@code
- * fine(fine() ? someMessage() : null);
+ * info(info() ? someMessage() : null);
  * }
  *
  * </pre>
  *
  * <p>
  *
- * Level Guidelines:
+ * DSA defines levels differently than JUL, however, all JUL levels will be mapped / formatted
+ * for DSA.  Level guidelines:
  *
  * <ul>
  *
- * <li>finest = verbose or trace
+ * <li>trace() = DSA trace  = JUL finest
+ *
+ * <li>debug() = DSA debug  = JUL finer
  *
- * <li>finer  = debug
+ * <li>fine()  = DSA info   = JUL fine, config
  *
- * <li>fine   = common or frequent event
+ * <li>warn()  = DSA warn   = Custom level
  *
- * <li>config = configuration info
+ * <li>info()  = DSA sys    = JUL info
  *
- * <li>info   = major lifecycle event
+ * <li>error() = DSA error  = JUL warning
  *
- * <li>warn   = unusual and infrequent, but not critical
+ * <li>admin() = DSA admin  = Custom level
  *
- * <li>severe = critical / fatal error or event
+ * <li>fatal() = DSA fatal  = JUL severe
  *
  * </ul>
  *
  * @author Aaron Hansen
  */
-public class DSLogger {
+public class DSLogger implements DSILevels {
+
+    private Logger logger;
+
+    /**
+     * Override point, returns the console logger by default.
+     */
+    private Logger getLogger() {
+        if (logger == null) {
+            logger = Logger.getLogger(getLogName());
+        }
+        return logger;
+    }
+
+    /**
+     * Override point, returns the simple class name by default.
+     */
+    protected String getLogName() {
+        return getClass().getSimpleName();
+    }
 
     /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
+    // Logging methods, ordered from lowest severity to highest
     /////////////////////////////////////////////////////////////////
 
     /**
      * True if the level is loggable.
      */
-    public boolean config() {
-        return getLogger().isLoggable(CONFIG);
+    public boolean trace() {
+        return getLogger().isLoggable(trace);
     }
 
-    public void config(Object msg) {
-        getLogger().log(CONFIG, string(msg));
+    /**
+     * Log a trace or verbose event.
+     */
+    public void trace(Object msg) {
+        getLogger().log(trace, string(msg));
     }
 
     /**
-     * Override point, returns the console logger by default.
+     * Log a trace or verbose event.
      */
-    public Logger getLogger() {
-        return DSLogging.getDefaultLogger();
+    public void trace(Object msg, Throwable x) {
+        getLogger().log(trace, string(msg), x);
     }
 
     /**
      * True if the level is loggable.
      */
-    public boolean fine() {
-        return getLogger().isLoggable(FINE);
+    public boolean debug() {
+        return getLogger().isLoggable(debug);
     }
 
     /**
-     * Log a frequent event.
+     * Log a debug event.
      */
-    public void fine(Object msg) {
-        getLogger().log(FINE, string(msg));
+    public void debug(Object msg) {
+        getLogger().log(debug, string(msg));
     }
 
     /**
-     * Log a frequent event.
+     * Log a debug event.
      */
-    public void fine(Object msg, Throwable x) {
-        getLogger().log(FINE, string(msg), x);
+    public void debug(Object msg, Throwable x) {
+        getLogger().log(debug, string(msg), x);
     }
 
     /**
      * True if the level is loggable.
      */
-    public boolean finer() {
-        return getLogger().isLoggable(FINER);
+    public boolean fine() {
+        return getLogger().isLoggable(fine);
     }
 
     /**
-     * Log a debug event.
+     * Log a frequent event.
      */
-    public void finer(Object msg) {
-        getLogger().log(FINER, string(msg));
+    public void fine(Object msg) {
+        getLogger().log(fine, string(msg));
     }
 
     /**
-     * Log a debug event.
+     * Log a frequent event.
      */
-    public void finer(Object msg, Throwable x) {
-        getLogger().log(FINER, string(msg), x);
+    public void fine(Object msg, Throwable x) {
+        getLogger().log(fine, string(msg), x);
     }
 
     /**
      * True if the level is loggable.
      */
-    public boolean finest() {
-        return getLogger().isLoggable(FINEST);
+    public boolean warn() {
+        return getLogger().isLoggable(warn);
     }
 
     /**
-     * Log a trace or verbose event.
+     * Log an unusual but not critical event.
      */
-    public void finest(Object msg) {
-        getLogger().log(FINEST, string(msg));
+    public void warn(Object msg) {
+        getLogger().log(warn, string(msg));
     }
 
     /**
-     * Log a trace or verbose event.
+     * Log an unusual but not critical event.
      */
-    public void finest(Object msg, Throwable x) {
-        getLogger().log(FINEST, string(msg), x);
+    public void warn(Object msg, Throwable x) {
+        getLogger().log(warn, string(msg), x);
     }
 
     /**
      * True if the level is loggable.
      */
     public boolean info() {
-        return getLogger().isLoggable(INFO);
+        return getLogger().isLoggable(info);
     }
 
     /**
      * Log an infrequent major lifecycle event.
      */
     public void info(Object msg) {
-        getLogger().log(INFO, string(msg));
+        getLogger().log(info, string(msg));
     }
 
     /**
      * Log an infrequent major lifecycle event.
      */
     public void info(Object msg, Throwable x) {
-        getLogger().log(INFO, string(msg), x);
+        getLogger().log(info, string(msg), x);
     }
 
     /**
      * True if the level is loggable.
      */
-    public boolean severe() {
-        return getLogger().isLoggable(SEVERE);
+    public boolean error() {
+        return getLogger().isLoggable(warn);
     }
 
-    public void severe(Object msg) {
-        getLogger().log(SEVERE, string(msg));
+    public void error(Object msg) {
+        getLogger().log(warn, string(msg));
     }
 
-    public void severe(Object msg, Throwable x) {
-        getLogger().log(SEVERE, string(msg), x);
-    }
-
-    private String string(Object obj) {
-        if (obj == null) {
-            return null;
-        }
-        return obj.toString();
+    public void error(Object msg, Throwable x) {
+        getLogger().log(warn, string(msg), x);
     }
 
     /**
      * True if the level is loggable.
      */
-    public boolean warn() {
-        return getLogger().isLoggable(WARNING);
+    public boolean admin() {
+        return getLogger().isLoggable(admin);
     }
 
-    /**
-     * Log an unusual but not critical event.
-     */
-    public void warn(Object msg) {
-        getLogger().log(WARNING, string(msg));
+    public void admin(Object msg) {
+        getLogger().log(admin, string(msg));
+    }
+
+    public void admin(Object msg, Throwable x) {
+        getLogger().log(admin, string(msg), x);
     }
 
     /**
-     * Log an unusual but not critical event.
+     * True if the level is loggable.
      */
-    public void warn(Object msg, Throwable x) {
-        getLogger().log(WARNING, string(msg), x);
+    public boolean fatal() {
+        return getLogger().isLoggable(fatal);
+    }
+
+    public void fatal(Object msg) {
+        getLogger().log(fatal, string(msg));
+    }
+
+    public void fatal(Object msg, Throwable x) {
+        getLogger().log(fatal, string(msg), x);
+    }
+
+    private String string(Object obj) {
+        if (obj == null) {
+            return null;
+        }
+        return obj.toString();
     }
 
 
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/DSLogging.java b/dslink-core/src/main/java/org/iot/dsa/logging/DSLogging.java
index 281e1a57..1bdf8dda 100644
--- a/dslink-core/src/main/java/org/iot/dsa/logging/DSLogging.java
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/DSLogging.java
@@ -2,8 +2,10 @@
 
 import java.io.File;
 import java.io.PrintStream;
+import java.util.Enumeration;
 import java.util.logging.Handler;
 import java.util.logging.Level;
+import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
 /**
@@ -51,6 +53,21 @@ private DSLogging() {
     // Methods
     ///////////////////////////////////////////////////////////////////////////
 
+    /**
+     * Closes all async log handlers.
+     */
+    public static void close() {
+        Enumeration<String> logs = LogManager.getLogManager().getLoggerNames();
+        while (logs.hasMoreElements()) {
+            Logger l = Logger.getLogger(logs.nextElement());
+            for (Handler h : l.getHandlers()) {
+                if (h instanceof AsyncLogHandler) {
+                    h.close();
+                }
+            }
+        }
+    }
+
     /**
      * The default logger.
      */
@@ -108,10 +125,6 @@ public static void setDefaultLevel(Level level) {
         defaultLogger.setLevel(level);
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Initialization
     ///////////////////////////////////////////////////////////////////////////
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/FileLogHandler.java b/dslink-core/src/main/java/org/iot/dsa/logging/FileLogHandler.java
index cb32878e..7ec7b520 100644
--- a/dslink-core/src/main/java/org/iot/dsa/logging/FileLogHandler.java
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/FileLogHandler.java
@@ -93,13 +93,6 @@ public boolean accept(File dir, String name) {
         return backups;
     }
 
-    /**
-     * The size after which a logging file will be backed up and cleared.
-     */
-    public int getBackupThreshold() {
-        return backupThreshold;
-    }
-
     /**
      * The number of backup files to retain.
      */
diff --git a/dslink-core/src/main/java/org/iot/dsa/logging/PrintStreamLogHandler.java b/dslink-core/src/main/java/org/iot/dsa/logging/PrintStreamLogHandler.java
index fc78c62d..7509e594 100644
--- a/dslink-core/src/main/java/org/iot/dsa/logging/PrintStreamLogHandler.java
+++ b/dslink-core/src/main/java/org/iot/dsa/logging/PrintStreamLogHandler.java
@@ -9,41 +9,17 @@
  */
 public class PrintStreamLogHandler extends AsyncLogHandler {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
     private String name;
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
     public PrintStreamLogHandler(String name, PrintStream out) {
         this.name = name;
         setOut(out);
         start();
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
     @Override
     public String getThreadName() {
         return name;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-} //class
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSBytes.java b/dslink-core/src/main/java/org/iot/dsa/node/DSBytes.java
index 4cdbd53e..ebfeb42d 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSBytes.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSBytes.java
@@ -17,6 +17,7 @@ public class DSBytes extends DSElement {
     // Constants
     // ---------
 
+    private final static char[] HEX = "0123456789ABCDEF".toCharArray();
     public static final DSBytes NULL = new DSBytes(new byte[0]);
     private static final String PREFIX = "\u001Bbytes:";
 
@@ -61,6 +62,19 @@ public boolean equals(Object arg) {
         return false;
     }
 
+    /**
+     * Converts a hex string into a byte array.
+     */
+    public static byte[] fromHex(CharSequence s) {
+        int len = s.length();
+        byte[] ret = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            ret[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i + 1), 16));
+        }
+        return ret;
+    }
+
     /**
      * The raw bytes, do not modify.
      */
@@ -182,6 +196,7 @@ public static int readInt(byte[] buf, int off, boolean bigEndian) {
      * @param bigEndian Whether to decode in big or little endian byte ordering.
      */
     public static int readInt(InputStream in, boolean bigEndian) {
+        int ret = 0;
         try {
             if (bigEndian) {
                 return (((in.read() & 0xFF) << 24) |
@@ -189,14 +204,14 @@ public static int readInt(InputStream in, boolean bigEndian) {
                         ((in.read() & 0xFF) << 8) |
                         ((in.read() & 0xFF) << 0));
             }
-            return (((in.read() & 0xFF) << 0) |
+            ret = (((in.read() & 0xFF) << 0) |
                     ((in.read() & 0xFF) << 8) |
                     ((in.read() & 0xFF) << 16) |
                     ((in.read() & 0xFF) << 24));
         } catch (IOException x) {
             DSException.throwRuntime(x);
         }
-        return 0; //unreachable
+        return ret;
     }
 
     /**
@@ -234,6 +249,7 @@ public static long readLong(byte[] buf, int off, boolean bigEndian) {
      * @param bigEndian Whether to decode in big or little endian byte ordering.
      */
     public static long readLong(InputStream in, boolean bigEndian) {
+        long ret = 0;
         try {
             if (bigEndian) {
                 return (((long) (in.read() & 0xFF) << 56) |
@@ -245,7 +261,7 @@ public static long readLong(InputStream in, boolean bigEndian) {
                         ((in.read() & 0xFF) << 8) |
                         ((in.read() & 0xFF) << 0));
             }
-            return (((in.read() & 0xFF) << 0) |
+            ret = (((in.read() & 0xFF) << 0) |
                     ((in.read() & 0xFF) << 8) |
                     ((in.read() & 0xFF) << 16) |
                     ((long) (in.read() & 0xFF) << 24) |
@@ -256,7 +272,7 @@ public static long readLong(InputStream in, boolean bigEndian) {
         } catch (IOException x) {
             DSException.throwRuntime(x);
         }
-        return 0; //unreachable
+        return ret;
     }
 
     /**
@@ -280,30 +296,56 @@ public static short readShort(byte[] buf, int off, boolean bigEndian) {
      * @param bigEndian Whether to decode in big or little endian byte ordering.
      */
     public static short readShort(InputStream in, boolean bigEndian) {
+        short ret = 0;
         try {
             if (bigEndian) {
                 return (short) (((in.read() & 0xFF) << 8) | ((in.read() & 0xFF) << 0));
             }
-            return (short) (((in.read() & 0xFF) << 0) | ((in.read() & 0xFF) << 8));
+            ret = (short) (((in.read() & 0xFF) << 0) | ((in.read() & 0xFF) << 8));
         } catch (IOException x) {
             DSException.throwRuntime(x);
         }
-        return 0;//unreachable
+        return ret;
     }
 
-    /*
     @Override
-    public DSString toElement() {
-        if (isNull()) {
-            return DSString.NULL;
+    public byte[] toBytes() {
+        return value;
+    }
+
+    /**
+     * Converts the bytes into a hex string.
+     *
+     * @param val What to convert.
+     * @param buf Where to put the results, can be null.
+     * @return The buf parameter, or a new StringBuilder if the param was null.
+     */
+    public static StringBuilder toHex(byte val, StringBuilder buf) {
+        if (buf == null) {
+            buf = new StringBuilder();
         }
-        return DSString.valueOf(toString());
+        buf.append(HEX[(val >>> 4) & 0x0F]);
+        buf.append(HEX[val & 0x0F]);
+        return buf;
     }
-    */
 
-    @Override
-    public byte[] toBytes() {
-        return value;
+    /**
+     * Converts the bytes into a hex string.
+     *
+     * @param bytes What to convert.
+     * @param buf   Where to put the results, can be null.
+     * @return The buf parameter, or a new StringBuilder if the param was null.
+     */
+    public static StringBuilder toHex(byte[] bytes, StringBuilder buf) {
+        if (buf == null) {
+            buf = new StringBuilder();
+        }
+        for (int i = 0, len = bytes.length; i < len; i++) {
+            int val = bytes[i] & 0xFF;
+            buf.append(HEX[val >>> 4] & 0x0F);
+            buf.append(HEX[val & 0x0F]);
+        }
+        return buf;
     }
 
     @Override
@@ -326,6 +368,9 @@ public DSBytes valueOf(DSElement arg) {
         if ((arg == null) || arg.isNull()) {
             return NULL;
         }
+        if (arg instanceof DSBytes) {
+            return (DSBytes) arg;
+        }
         if (arg instanceof DSString) {
             return valueOf(arg.toString());
         }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSElement.java b/dslink-core/src/main/java/org/iot/dsa/node/DSElement.java
index 5d0814fa..02219e21 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSElement.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSElement.java
@@ -1,7 +1,7 @@
 package org.iot.dsa.node;
 
 /**
- * The primitives of the node model.  These map JSON types without additional meta-data.
+ * The primitives of the node model.  These map to JSON types without additional meta-data.
  *
  * @author Aaron Hansen
  */
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSFlexEnum.java b/dslink-core/src/main/java/org/iot/dsa/node/DSFlexEnum.java
index 0e1f0d92..bdb12dc5 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSFlexEnum.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSFlexEnum.java
@@ -6,7 +6,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSFlexEnum extends DSValue implements DSIEnum, DSIMetadata {
+public class DSFlexEnum extends DSValue implements DSIEnum, DSIMetadata, DSIStorable {
 
     // Constants
     // ---------
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSGroup.java b/dslink-core/src/main/java/org/iot/dsa/node/DSGroup.java
index 4881fa36..ef2cc10c 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSGroup.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSGroup.java
@@ -57,6 +57,10 @@ public int hashCode() {
         return hashCode;
     }
 
+    public boolean hasParent() {
+        return parent != null;
+    }
+
     /**
      * Returns the item at index 0.
      *
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSIPublisher.java b/dslink-core/src/main/java/org/iot/dsa/node/DSIPublisher.java
deleted file mode 100644
index fe05b91f..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSIPublisher.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.iot.dsa.node;
-
-/**
- * DSEvent producer.
- *
- * <p>
- *
- * Nodes do not notify parent containers of any events.  However, if a node subtype implements this
- * interface, parent containers will treat all events emitted as a child changed event.
- *
- * <p>
- *
- * Mutable DSIValues such as DSFlexEnum should implement this interface. However, DSList and DSMap
- * do not.
- *
- * <p>
- *
- * Containers will not publish events if they are stopped.
- *
- * @author Aaron Hansen
- * @see DSISubscriber
- */
-public interface DSIPublisher {
-
-    /**
-     * Subscribes the argument, has no effect if the argument is already subscribed.
-     */
-    public void subscribe(DSISubscriber subscriber);
-
-    /**
-     * Unsubscribes the argument, has no effect if the argument is not currently subscribed.
-     */
-    public void unsubscribe(DSISubscriber subscriber);
-
-    /**
-     * Passed to DSISubscriber onEvent to describe the event.
-     */
-    public enum Event {
-
-        /**
-         * The event will have a source (parent) and an info.
-         */
-        CHILD_ADDED,
-
-        /**
-         * The event will have a source (parent) and an info.
-         */
-        CHILD_CHANGED,
-
-        /**
-         * The event will have a source (parent) and an info.
-         */
-        CHILD_REMOVED,
-
-        /**
-         * The info of a child changed.  The event will have a source (parent) and an info.
-         */
-        INFO_CHANGED,
-
-        /**
-         * The publisher was mutated in such a way that did not involve a child.
-         */
-        PUBLISHER_CHANGED,
-
-    }
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSIStorable.java b/dslink-core/src/main/java/org/iot/dsa/node/DSIStorable.java
new file mode 100644
index 00000000..8bb106eb
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSIStorable.java
@@ -0,0 +1,23 @@
+package org.iot.dsa.node;
+
+/**
+ * Enables custom serialization for non-node values in the configuration database.  Not used
+ * for DSA interop.
+ *
+ * @author Aaron Hansen
+ */
+public interface DSIStorable {
+
+    /**
+     * Deserialize a value from the configuration database, these will be values returned from the
+     * store() method.
+     */
+    public DSIValue restore(DSElement element);
+
+    /**
+     * Serialize the value for the configuration database.  Can be a different element type than
+     * toElement().
+     */
+    public DSElement store();
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSISubscriber.java b/dslink-core/src/main/java/org/iot/dsa/node/DSISubscriber.java
deleted file mode 100644
index 3e18a426..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSISubscriber.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.iot.dsa.node;
-
-import org.iot.dsa.node.DSIPublisher.Event;
-
-/**
- * Interface for receiving events from DSIPublishers.
- *
- * @author Aaron Hansen
- * @see DSIPublisher
- */
-public interface DSISubscriber {
-
-    /**
-     * @param publisher The object that was subscribed to, will never be null.
-     * @param child     If the event does not involve a child, this will be null.
-     * @param event     Describes the event, will never be null.
-     */
-    public void onEvent(DSIObject publisher, DSInfo child, Event event);
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSIValue.java b/dslink-core/src/main/java/org/iot/dsa/node/DSIValue.java
index 396acf44..9f7a92a6 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSIValue.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSIValue.java
@@ -13,18 +13,22 @@
  *
  * <li>Have a NULL instance if possible.
  *
- * <li>Try to maintain singleton instances when possible.
+ * <li>Try to maintain singleton instances when possible, especially for common instances.
  *
- * <li>Use static valueOf methods to ensure singleton values such as NULL are used.
+ * <li>Instead of constructors, use static valueOf methods to ensure singleton values such as NULL
+ * are used.
  *
  * <li>Register an instance for decoding with DSRegistry.registerDecoder(YourValue.class, instance)
  * in a static initializer. If you have a NULL instance, use that.
  *
  * <li>If mutable (avoid if at all possible), implement DSIPublisher so nodes know of changes.
  *
+ * <li>If a DSNode subclass is implementing DSIValue, it's onSet(DSIValue) must also be overridden.
+ *
  * </ul>
  *
  * @author Aaron Hansen
+ * @see DSNode#onSet(DSIValue)
  */
 public interface DSIValue extends DSIObject {
 
@@ -39,18 +43,6 @@ public interface DSIValue extends DSIObject {
      */
     public boolean isNull();
 
-    /**
-     * Deserialize a value from the configuration database, these will be values returned from the
-     * store() method.
-     */
-    public DSIValue restore(DSElement element);
-
-    /**
-     * Serialize the value for the configuration database.  Can be a different element type than
-     * toElement().
-     */
-    public DSElement store();
-
     /**
      * The current value should convert itself to an element for DSA interop such as subscription
      * updates, and setting requests.  This is not for configuration database serialization.
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSInfo.java b/dslink-core/src/main/java/org/iot/dsa/node/DSInfo.java
index ff380e22..e0a74c13 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSInfo.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSInfo.java
@@ -3,6 +3,7 @@
 import java.util.Iterator;
 import org.iot.dsa.dslink.responder.ApiObject;
 import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.event.DSInfoTopic;
 import org.iot.dsa.util.DSUtil;
 
 /**
@@ -37,23 +38,18 @@
  *
  * @author Aaron Hansen
  */
-public class DSInfo implements ApiObject, DSISubscriber {
+public class DSInfo implements ApiObject {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////////
 
-    //Config vs admin vs operator
-    //
-    static final int CONFIG = 0;
+    static final int ADMIN = 0;
+    static final int DEFAULT_ON_COPY = 5;
     static final int HIDDEN = 1;
-    static final int TRANSIENT = 2;
-    static final int READONLY = 3;
     static final int PERMANENT = 4;
-    //static final int PERMANENTLY_SUBSCRIBED = 5;
-    //static final int NO_ADD_REMOVE_CHILDREN = 5;
-    //static final int NO_MODIFY_FLAGS = 5;
-    //static final int NO_AUDIT      = 5;
+    static final int READONLY = 3;
+    static final int TRANSIENT = 2;
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -86,6 +82,13 @@ public DSInfo copy() {
         DSInfo ret = new DSInfo();
         ret.flags = flags;
         ret.name = name;
+        if (isDefaultOnCopy()) {
+            DSIObject val = getDefaultObject();
+            if (val != null) {
+                ret.setObject(val.copy());
+                return ret;
+            }
+        }
         if (value != null) {
             ret.setObject(value.copy());
         }
@@ -146,8 +149,8 @@ private boolean equivalent(DSInfo arg) {
     }
 
     private void fireInfoChanged() {
-        if (parent != null) {
-            parent.infoChanged(this);
+        if ((parent != null) && (parent.isRunning())) {
+            parent.fire(DSInfoTopic.INSTANCE, DSInfoTopic.Event.METADATA_CHANGED, this);
         }
     }
 
@@ -164,7 +167,7 @@ public Iterator<ApiObject> getChildren() {
     /**
      * If this represents a dynamic child, this just returns the current value.
      */
-    public DSIObject getDefaultObject() { //TODO Maybe dynamic should return null.
+    public DSIObject getDefaultObject() {
         if (value == null) {
             return null;
         }
@@ -186,20 +189,15 @@ int getFlags() {
         return flags;
     }
 
-    @Override
-    public void getMetadata(DSMap bucket) {
-        if (value instanceof DSIMetadata) {
-            ((DSIMetadata) value).getMetadata(bucket);
-        }
-        if (value instanceof DSNode) {
-            ((DSNode) value).getMetadata(this, bucket);
-        }
-    }
-
     public String getName() {
         return name;
     }
 
+    @Override
+    public void getMetadata(DSMap bucket) {
+        DSMetadata.getMetadata(this, bucket);
+    }
+
     /**
      * A convenience that casts getObject().
      */
@@ -231,6 +229,11 @@ public boolean hasChildren() {
         return false;
     }
 
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
     /**
      * True if there is another info after this one.
      */
@@ -238,19 +241,21 @@ public boolean hasNext() {
         return next != null;
     }
 
-    @Override
-    public int hashCode() {
-        return System.identityHashCode(this);
-    }
-
     @Override
     public boolean isAction() {
         return value instanceof DSAction;
     }
 
     @Override
-    public boolean isConfig() {
-        return getFlag(CONFIG);
+    public boolean isAdmin() {
+        return getFlag(ADMIN);
+    }
+
+    /**
+     * Whether or not the current value, or the default value is copied.
+     */
+    public boolean isDefaultOnCopy() {
+        return getFlag(DEFAULT_ON_COPY);
     }
 
     /**
@@ -290,8 +295,8 @@ public boolean isHidden() {
     }
 
     /**
-     * True if the flags and target object are identical.  Two nodes are identical
-     * if their children are in the same order.
+     * True if the flags and target object are identical.  Two nodes are identical if their children
+     * are in the same order.
      */
     public boolean isIdentical(DSInfo arg) {
         if (arg == this) {
@@ -391,14 +396,9 @@ public DSInfo nextValue() {
         return cur;
     }
 
-    /**
-     * Routes events from child DSIPublishers to onChildChanged in the parent.
-     */
-    @Override
-    public void onEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        if (parent != null) {
-            parent.onChildChanged(this);
-        }
+    public DSInfo setAdmin(boolean admin) {
+        setFlag(ADMIN, admin);
+        return this;
     }
 
     DSInfo setFlag(int position, boolean on) {
@@ -407,11 +407,6 @@ DSInfo setFlag(int position, boolean on) {
         return this;
     }
 
-    public DSInfo setConfig(boolean config) {
-        setFlag(CONFIG, config);
-        return this;
-    }
-
     public DSInfo setHidden(boolean hidden) {
         setFlag(HIDDEN, hidden);
         return this;
@@ -447,18 +442,6 @@ public DSInfo setTransient(boolean trans) {
         return this;
     }
 
-    void subscribe() {
-        if (value instanceof DSIPublisher) {
-            ((DSIPublisher) value).subscribe(this);
-        }
-    }
-
-    void unsubscribe() {
-        if (value instanceof DSIPublisher) {
-            ((DSIPublisher) value).unsubscribe(this);
-        }
-    }
-
     ///////////////////////////////////////////////////////////////////////////
     // Inner Classes
     ///////////////////////////////////////////////////////////////////////////
@@ -485,8 +468,4 @@ public void remove() {
 
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-} //class
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSInfoProxy.java b/dslink-core/src/main/java/org/iot/dsa/node/DSInfoProxy.java
index 29df0de0..5f10e0f6 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSInfoProxy.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSInfoProxy.java
@@ -9,10 +9,6 @@
  */
 class DSInfoProxy extends DSInfo {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Fields
     ///////////////////////////////////////////////////////////////////////////
@@ -42,7 +38,12 @@ public DSInfo copy() {
         ret.flags = flags;
         ret.name = name;
         ret.defaultInfo = defaultInfo;
-        if (value != null) {
+        if (isDefaultOnCopy()) {
+            DSIObject val = getDefaultObject();
+            if (val != null) {
+                ret.setObject(val.copy());
+            }
+        } else if (value != null) {
             ret.setObject(value.copy());
         }
         return ret;
@@ -65,10 +66,7 @@ public boolean equalsDefault() {
 
     @Override
     public boolean equalsDefaultState() {
-        if (flags != defaultInfo.flags) {
-            return false;
-        }
-        return true;
+        return flags == defaultInfo.flags;
     }
 
     @Override
@@ -92,12 +90,4 @@ boolean isProxy() {
         return true;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-} //class
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSJavaEnum.java b/dslink-core/src/main/java/org/iot/dsa/node/DSJavaEnum.java
index 2da8b7a7..050b3de6 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSJavaEnum.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSJavaEnum.java
@@ -7,7 +7,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSJavaEnum extends DSValue implements DSIEnum, DSIMetadata {
+public class DSJavaEnum extends DSValue implements DSIEnum, DSIMetadata, DSIStorable {
 
     // Constants
     // ---------
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSList.java b/dslink-core/src/main/java/org/iot/dsa/node/DSList.java
index b10499f9..2c3262fc 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSList.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSList.java
@@ -97,7 +97,7 @@ public DSList add(int val) {
      */
     public DSList addAll(DSList list) {
         for (DSElement e : list) {
-            add(e);
+            add(e.copy());
         }
         return this;
     }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSMap.java b/dslink-core/src/main/java/org/iot/dsa/node/DSMap.java
index 7c0b2e31..e47de7b8 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSMap.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSMap.java
@@ -58,7 +58,7 @@ public boolean contains(String key) {
     }
 
     @Override
-    public DSElement copy() {
+    public DSMap copy() {
         DSMap ret = new DSMap();
         for (int i = 0, len = size(); i < len; i++) {
             ret.put(getKey(i), get(i).copy());
@@ -427,7 +427,7 @@ public DSMap putAll(DSMap toAdd) {
         Entry e;
         for (int i = 0, len = toAdd.size(); i < len; i++) {
             e = toAdd.getEntry(i);
-            put(e.getKey(), e.getValue());
+            put(e.getKey(), e.getValue().copy());
         }
         return this;
     }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSMetadata.java b/dslink-core/src/main/java/org/iot/dsa/node/DSMetadata.java
index 5155c93e..7270fb64 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSMetadata.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSMetadata.java
@@ -11,18 +11,19 @@ public class DSMetadata {
     // Constants
     ///////////////////////////////////////////////////////////////////////////
 
-    public static final String BOOLEAN_RANGE = "booleanRange";
-    public static final String DESCRIPTION = "description";
-    public static final String DECIMAL_PLACES = "decimalPlaces";
-    public static final String DEFAULT = "default";
-    public static final String EDITOR = "editor";
-    public static final String ENUM_RANGE = "enumRange";
-    public static final String NAME = "name";
-    public static final String MAX_VALUE = "maxValue";
-    public static final String MIN_VALUE = "minValue";
-    public static final String PLACEHOLDER = "placeholder";
-    public static final String TYPE = "type";
-    public static final String UNIT = "unit";
+    public static final String BOOLEAN_RANGE = "$booleanRange";
+    public static final String DESCRIPTION = "$description";
+    public static final String DECIMAL_PLACES = "$decimalPlaces";
+    public static final String DEFAULT = "$default";
+    public static final String DISPLAY_NAME = "$displayName";
+    public static final String EDITOR = "$editor";
+    public static final String ENUM_RANGE = "$enumRange";
+    public static final String NAME = "$name";
+    public static final String MAX_VALUE = "$maxValue";
+    public static final String MIN_VALUE = "$minValue";
+    public static final String PLACEHOLDER = "$placeholder";
+    public static final String TYPE = "$type";
+    public static final String UNIT = "$unit";
 
     //public static final String EDITOR_DATE = "date";
     //public static final String EDITOR_DATE_RANGE = "daterange";
@@ -95,6 +96,13 @@ public String getDescription() {
         return map.getString(DESCRIPTION);
     }
 
+    /**
+     * The alternate display name, or null.
+     */
+    public String getDisplayName() {
+        return map.getString(DISPLAY_NAME);
+    }
+
     /**
      * The editor, or null.
      */
@@ -116,6 +124,30 @@ public DSElement getMaxValue() {
         return map.get(MAX_VALUE);
     }
 
+    /**
+     * Fully acquires metadata about the info.  If the target of the info implements DSIMetadata,
+     * it is put in the bucket first.  Then if the parent node is allowed is given the the chance
+     * to add/edit the bucket.
+     *
+     * @param info   Who to get metadata for.
+     * @param bucket Where to put the metadata, can be null in which case a new map will be
+     *               instantiated.
+     * @return The bucket arg, or a new map if the arg was null.
+     */
+    public static DSMap getMetadata(DSInfo info, DSMap bucket) {
+        if (bucket == null) {
+            bucket = new DSMap();
+        }
+        DSIObject obj = info.getObject();
+        if (obj instanceof DSIMetadata) {
+            ((DSIMetadata) obj).getMetadata(bucket);
+        }
+        if (info.getParent() != null) {
+            info.getParent().getMetadata(info, bucket);
+        }
+        return bucket;
+    }
+
     /**
      * The min value, or null.
      */
@@ -215,6 +247,13 @@ public DSMetadata setDescription(String arg) {
         return this;
     }
 
+    public DSMetadata setDisplayName(String arg) {
+        if (arg != null) {
+            map.put(DISPLAY_NAME, arg);
+        }
+        return this;
+    }
+
     /**
      * See the EDITOR_ constants.
      */
@@ -226,7 +265,7 @@ public DSMetadata setEditor(String arg) {
     }
 
     /**
-     * See the EDITOR_ constants.
+     * List of string values for an enum or string.
      */
     public DSMetadata setEnumRange(DSList arg) {
         if (arg != null) {
@@ -235,6 +274,13 @@ public DSMetadata setEnumRange(DSList arg) {
         return this;
     }
 
+    /**
+     * List of string values for an enum or string.
+     */
+    public DSMetadata setEnumRange(String... range) {
+        return setEnumRange(DSList.valueOf(range));
+    }
+
     /**
      * Change the underlying map so the metadata instance can be reused.
      */
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSNode.java b/dslink-core/src/main/java/org/iot/dsa/node/DSNode.java
index 7e461c8d..ec555486 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSNode.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSNode.java
@@ -1,269 +1,162 @@
 package org.iot.dsa.node;
 
-import static org.iot.dsa.node.DSIPublisher.Event.CHILD_ADDED;
-import static org.iot.dsa.node.DSIPublisher.Event.CHILD_CHANGED;
-import static org.iot.dsa.node.DSIPublisher.Event.CHILD_REMOVED;
-import static org.iot.dsa.node.DSIPublisher.Event.PUBLISHER_CHANGED;
-
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.Map;
+import java.util.TreeMap;
 import org.iot.dsa.dslink.DSIResponder;
 import org.iot.dsa.dslink.responder.InboundSetRequest;
 import org.iot.dsa.logging.DSLogger;
-import org.iot.dsa.logging.DSLogging;
 import org.iot.dsa.node.action.ActionInvocation;
 import org.iot.dsa.node.action.ActionResult;
+import org.iot.dsa.node.event.DSIEvent;
+import org.iot.dsa.node.event.DSISubscriber;
+import org.iot.dsa.node.event.DSInfoTopic;
+import org.iot.dsa.node.event.DSTopic;
+import org.iot.dsa.node.event.DSValueTopic;
 import org.iot.dsa.util.DSException;
 import org.iot.dsa.util.DSUtil;
 
 /**
- * The primary organization unit of the node tree.  Most links will bind their specific logic by
+ * The organizational unit of the node tree.  Most links will bind their specific logic by
  * subclassing DSNode and utilizing the lifecycle callbacks.
- *
+ * <p>
  * To create a node subclass,  you should understand the following concepts:
- *
  * <p>
- *
  * <ul>
- *
  * <li>Constructors
- *
  * <li>Defaults
- *
  * <li>Node Lifecycle and Callbacks
- *
  * <li>Subscriptions
- *
  * <li>Values
- *
  * <li>Actions
- *
  * <li>DSInfo
- *
  * </ul>
- *
  * <p>
- *
  * <h3>Constructors</h3>
- *
+ * <p>
  * DSNode sub-classes must support the public no-arg constructor.  This is how they will be
  * instantiated when deserializing the configuration database.
- *
  * <p>
- *
  * <h3>Defaults</h3>
- *
  * <p>
- *
  * Every subtype of DSNode has a private default instance, all other instances of any particular
  * type are copies of the default instance.  You should never perform application logic unless your
  * node is running (started or stable) because of this.
- *
+ * <p>
  * If a DSNode subtype needs to have specific child nodes or values (most will), it should override
  * the declareDefaults method.  The method should:
- *
  * <p>
- *
  * <ul>
- *
  * <li> Call super.declareDefaults();
- *
  * <li> Call DSNode.declareDefault(String name, DSIObject child) for each non-removable child.  Do
  * not add dynamic children in declareDefaults, because if they are removed, they will be re-added
  * the next time the link is restarted.
- *
  * </ul>
- *
  * <p>
- *
  * During node serialization (configuration database, not DSA interop), children that match their
  * declared default are omitted.  This has two benefits:
- *
  * <p>
- *
  * <ul>
- *
  * <li> Smaller node database means faster serialization / deserialization.
- *
  * <li> Default values can be modified and all existing database will be automatically upgraded the
  * next time the updated class loaded.
- *
  * </ul>
- *
  * <p>
- *
  * <h3>Lifecycle</h3>
- *
  * <p>
- *
- *
  * It is important to know the node lifecycle.  Your nodes should not execute any application logic
  * unless they are running (started or stable).
- *
  * <p>
- *
  * <b>Stopped</b>
- *
  * <p>
- *
  * A node is instantiated in the stopped state.  If a node tree has been persisted, will be be fully
  * restored in the stopped state.  DSNode.onStopped will not be called, it is only called when nodes
  * transition from running to stopped.
- *
  * <p>
- *
  * When nodes are removed from a running parent node, they will be stopped.  DSNode.onStopped will
  * be called after all child nodes have been stopped.
- *
  * <p>
- *
  * When a link is stopped, an attempt to stop the tree will be made, but it cannot be guaranteed.
- *
  * <p>
- *
  * <b>Started</b>
- *
  * <p>
- *
  * After the node tree is fully deserialized it will be started.  A node's onStart method will be
  * called after all of its child nodes have been started.  The only guarantee is that all child
  * nodes have been started.
- *
  * <p>
- *
  * Nodes will also started when they are added to an already running parent node.
- *
  * <p>
- *
  * <b>Stable</b>
- *
  * <p>
- *
  * Stable is called after the entire tree has been started.  The first time the node tree is loaded,
  * there is a stable delay of 5 seconds.  This is configurable as <b>stableDelay</b> in
  * <i>slink.json</i>.
- *
  * <p>
- *
  * Nodes added to an already stable parent will have onStart and onStable called immediately.
- *
  * <p>
- *
  * When in doubt of whether to use onStarted or onStable, use onStable.
- *
+ * <p>
  * <b>Other Callbacks</b>
- *
  * <p>
- *
  * When a node is stable, there are several other callbacks for various state changes.  All
  * callbacks begin with **on** such as onChildAdded().
- *
  * <p>
- *
  * <h3>Subscriptions</h3>
- *
  * <p>
- *
  * Nodes should suspend, or minimize activity when nothing is interested in them.  For example, if
  * nothing is interested in a point, it is best to not poll the point on the foreign system.
- *
  * <p>
- *
  * To do this you use the following APIs:
- *
  * <p>
- *
  * <ul>
- *
  * <li>DSNode.onSubscribed - Called when the node transitions from unsubscribed to subscribed.  This
  * is not called for subsequent subscribers once in the subscribed state.
- *
  * <li>DSNode.onUnsubscribed - Called when the node transitions from subscribed to unsubscribed. If
  * there are multiple subscribers, this is only called when the last one unsubscribes.
- *
  * <li>DSNode.isSubscribed - Tells the caller whether or not the node is subscribed.
- *
  * </ul>
- *
  * <p>
- *
  * <h3>Values</h3>
- *
  * <p>
- *
  * Values mostly represent leaf members of the node tree.  There are two types of values:
- *
  * <p>
- *
  * <ul>
- *
  * <li>DSElement - These map to the JSON type system and represent leaf members of the node tree.
- *
  * <li>DSIValue - These don't map to the JSON type system, and it is possible for nodes to implement
  * this interface. This allows for values to have children.
- *
  * </ul>
- *
  * <p>
- *
  * Many values are singleton instances.  This is for efficiency, the same value instance (e.g.
  * DSBoolean.TRUE) can be stored in many nodes. Singleton values must be immutable.
- *
  * <p>
- *
  * Whenever possible, values should also have NULL instance.  Rather than storing a generic null,
  * this helps the system decode the proper type such as when a requester is attempting to set a
  * value.
- *
  * <p>
- *
  * <h3>Actions</h3>
- *
  * <p>
- *
  * Add actions to your node to allow requester invocation using org.iot.dsa.node.action.DSAction.
- *
  * <p>
- *
  * Override DSNode.onInvoke to handle invocations.  The reason for this is complicated but it is
  * possible to subclass DSAction, just carefully read the javadoc if you do.  Be sure to call
  * super.onInvoke() when overriding that method.
- *
  * <p>
- *
  * <h3>DSInfo</h3>
- *
  * <p>
- *
  * All node children have corresponding DSInfo instances.  This type serves two purposes:
- *
  * <p>
- *
  * <ul>
- *
  * <li>It carries some meta-data about the relationship between the parent node and the child.
- *
  * <li>It tracks whether or not the child matches a declared default.
- *
  * </ul>
- *
  * <p>
- *
  * Important things for developers to know about DSInfo are:
- *
  * <p>
- *
  * <ul>
- *
  * <li>You can configure state such as transient, readonly and hidden.
- *
  * <li>You can declare fields in the your Java class for default info instances to avoid looking up
  * the child every time it is needed.  This is can be used to create fast getters and setters.
- *
  * </ul>
- *
  * <p>
  *
  * @author Aaron Hansen
@@ -276,7 +169,10 @@ public class DSNode extends DSLogger implements DSIObject, Iterable<DSInfo> {
 
     //Prevents infinite loops when initializing default instances.
     static final DSNode defaultDefaultInstance = new DSNode();
-    private static final int MAP_THRESHOLD = 10;
+    private static final int MAP_THRESHOLD = 7;
+
+    public static final DSTopic INFO_TOPIC = DSInfoTopic.INSTANCE;
+    public static final DSTopic VALUE_TOPIC = DSValueTopic.INSTANCE;
 
     private static int STATE_STOPPED = 0;
     private static int STATE_STARTED = 1;
@@ -286,20 +182,17 @@ public class DSNode extends DSLogger implements DSIObject, Iterable<DSInfo> {
     // Fields
     ///////////////////////////////////////////////////////////////////////////
 
-    private HashMap<String, DSInfo> childMap;
+    private Map<String, DSInfo> childMap;
     private DSNode defaultInstance;
     private DSInfo firstChild;
     private DSInfo infoInParent;
     private DSInfo lastChild;
+    private Object mutex = new Object();
     private String path;
-    private DSISubscriber subscriber;
+    private Subscription subscription;
     private int size = 0;
     private int state = 1; //See STATE_*
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////////
@@ -309,7 +202,7 @@ public class DSNode extends DSLogger implements DSIObject, Iterable<DSInfo> {
      */
     void add(final DSInfo info) {
         dsInit();
-        synchronized (this) {
+        synchronized (mutex) {
             if (lastChild != null) {
                 lastChild.next = info;
                 info.prev = lastChild;
@@ -333,15 +226,9 @@ void add(final DSInfo info) {
             try {
                 onChildAdded(info);
             } catch (Exception x) {
-                severe(getPath(), x);
-            }
-            if (subscriber != null) {
-                try {
-                    subscriber.onEvent(this, info, CHILD_ADDED);
-                } catch (Exception x) {
-                    severe(getPath(), x);
-                }
+                error(getPath(), x);
             }
+            fire(INFO_TOPIC, DSInfoTopic.Event.CHILD_ADDED, info);
         }
     }
 
@@ -373,13 +260,12 @@ public DSInfo add(String name, DSIObject object) {
         if (info != null) {
             throw new IllegalArgumentException("Name already in use: " + name);
         }
-        info = new DSInfo(name, object);
+        info = new DSInfo(name.intern(), object);
         add(info);
         if (isRunning()) {
             if (argIsNode) {
                 argAsNode.start();
             }
-            info.subscribe();
         }
         if (isStable()) {
             if (argIsNode) {
@@ -389,27 +275,6 @@ public DSInfo add(String name, DSIObject object) {
         return info;
     }
 
-    /**
-     * Can be used to force a child changed event for the given child.
-     */
-    public void childChanged(DSInfo info) {
-        if (info.getParent() != this) {
-            throw new IllegalArgumentException("Not a child of this node.");
-        }
-        try {
-            onChildChanged(info);
-        } catch (Exception x) {
-            severe(getPath(), x);
-        }
-        if (subscriber != null) {
-            try {
-                subscriber.onEvent(this, info, CHILD_CHANGED);
-            } catch (Exception x) {
-                severe(getPath(), x);
-            }
-        }
-    }
-
     /**
      * The number of children.
      */
@@ -520,6 +385,45 @@ void dsInit() {
         }
     }
 
+    /**
+     * Notifies subscribers of the event.
+     *
+     * @param topic Must not be null.
+     * @param event Must not be null.
+     * @param child Can be null.
+     */
+    protected void fire(DSTopic topic, DSIEvent event, DSInfo child) {
+        fire(topic, event, child, (Object[]) null);
+    }
+
+    /**
+     * Notifies subscribers of the event.
+     *
+     * @param topic  Must not be null.
+     * @param event  Must not be null.
+     * @param child  Can be null.
+     * @param params Optional
+     */
+    protected void fire(DSTopic topic, DSIEvent event, DSInfo child, Object... params) {
+        if (topic == null) {
+            throw new NullPointerException("Null topic");
+        }
+        if (event == null) {
+            throw new NullPointerException("Null event");
+        }
+        Subscription sub = subscription;
+        while (sub != null) {
+            if (sub.shouldFire(child, topic)) {
+                try {
+                    sub.subscriber.onEvent(topic, event, this, child, params);
+                } catch (Exception x) {
+                    error(getPath(), x);
+                }
+            }
+            sub = sub.next;
+        }
+    }
+
     /**
      * Returns the child value with the given name, or null.
      *
@@ -533,6 +437,13 @@ public DSIObject get(String name) {
         return null;
     }
 
+    /**
+     * A convenience for (DSElement) get(name).
+     */
+    public DSElement getElement(String name) {
+        return (DSElement) get(name);
+    }
+
     /**
      * DSInfo for this node in its parent, or null if un-parented.
      */
@@ -550,10 +461,10 @@ public DSInfo getInfo(String name) {
         if (firstChild == null) {
             return null;
         }
-        synchronized (this) {
+        synchronized (mutex) {
             if (size >= MAP_THRESHOLD) {
                 if (childMap == null) {
-                    childMap = new HashMap<String, DSInfo>(size);
+                    childMap = new TreeMap<String, DSInfo>();
                     for (DSInfo info = firstChild; info != null; info = info.next()) {
                         childMap.put(info.getName(), info);
                     }
@@ -623,17 +534,13 @@ public DSInfo getLastInfo() {
         return lastChild;
     }
 
-    /**
-     * Ascends the tree until a logger is found.  If overriding, call super.getLogger and set the
-     * result as the parent logger of your new logger.
-     */
     @Override
-    public Logger getLogger() {
+    protected String getLogName() {
         DSNode parent = getParent();
         if (parent != null) {
-            return parent.getLogger();
+            return parent.getLogName();
         }
-        return DSLogging.getDefaultLogger();
+        return super.getLogName();
     }
 
     /**
@@ -680,24 +587,10 @@ public String getPath() {
     }
 
     /**
-     * Called by the info when it detects a change.  Will propagate the event asynchronously.
+     * A convenience for (DSIValue) get(name).
      */
-    void infoChanged(final DSInfo info) {
-        if (isStopped()) {
-            return;
-        }
-        try {
-            onInfoChanged(info);
-        } catch (Exception x) {
-            severe(getPath(), x);
-        }
-        if (subscriber != null) {
-            try {
-                subscriber.onEvent(this, info, DSIPublisher.Event.INFO_CHANGED);
-            } catch (Exception x) {
-                severe(getPath(), x);
-            }
-        }
+    public DSIValue getValue(String name) {
+        return (DSIValue) get(name);
     }
 
     /**
@@ -812,7 +705,40 @@ public boolean isStopped() {
      * True if there are any subscribers.
      */
     public boolean isSubscribed() {
-        return subscriber != null;
+        return subscription != null;
+    }
+
+    /**
+     * True if there are any subscriptions with the matching child and topic.
+     *
+     * @param child Can be null.
+     * @param topic Can be null.
+     */
+    public boolean isSubscribed(DSInfo child, DSTopic topic) {
+        Subscription sub = subscription;
+        while (sub != null) {
+            if (DSUtil.equal(topic, sub.topic)) {
+                if (DSUtil.equal(child, sub.child)) {
+                    return true;
+                }
+            }
+            sub = sub.next;
+        }
+        return false;
+    }
+
+    /**
+     * True if there any subscriptions for the given topic.
+     */
+    public boolean isSubscribed(DSTopic topic) {
+        Subscription sub = subscription;
+        while (sub != null) {
+            if (sub.topic == topic) {
+                return true;
+            }
+            sub = sub.next;
+        }
+        return false;
     }
 
     /**
@@ -836,20 +762,6 @@ public Iterator<DSInfo> iterator() {
         return new ChildIterator();
     }
 
-    /**
-     * Fires a publisher changed event for this node.  Useful if the node is also a DSIValue and you
-     * want to notify listeners of a value change.
-     */
-    protected void nodeChanged() {
-        if (subscriber != null) {
-            try {
-                subscriber.onEvent(this, null, PUBLISHER_CHANGED);
-            } catch (Exception x) {
-                severe(getPath(), x);
-            }
-        }
-    }
-
     /**
      * Called when the given child is added and in the stable state.
      */
@@ -907,22 +819,44 @@ public void onSet(DSInfo info, DSIValue value) {
 
     /**
      * Override point, called only when a DSNode subclass implements DSIValue is being set.  This
-     * will throw and IllegalStateException if not overridden and called. Throw an exception to
+     * will throw and IllegalStateException if not overridden. You should store the value of the
+     * node as a child and call put in override implementation.  Throw an exception to
      * report an error to the requester.
      *
      * @param value The new value.
      * @see DSIResponder#onSet(InboundSetRequest)
+     * @see DSValueNode
      */
     public void onSet(DSIValue value) {
         throw new IllegalStateException("DSNode.onSet(DSIValue) not overridden");
     }
 
     /**
-     * Called when this node transitions from unsubscribed to subscribed.
+     * Called for every subscription.
+     *
+     * @param topic      Will not be null.
+     * @param child      Can be null.
+     * @param subscriber Will not be null.
+     */
+    protected void onSubscribe(DSTopic topic, DSInfo child, DSISubscriber subscriber) {
+    }
+
+    /**
+     * Called when this node transitions from having no subscriptions to having a subscription of
+     * any kind.
      */
     protected void onSubscribed() {
     }
 
+    /**
+     * Called when the child and topic pair transitions from having no subscriptions to have a
+     * subscription.
+     *
+     * @param child Can be null, which indicates node subscriptions.
+     */
+    protected void onSubscribed(DSTopic topic, DSInfo child) {
+    }
+
     /**
      * Called once this node is stable, but before stable is called on children.
      */
@@ -942,11 +876,30 @@ protected void onStopped() {
     }
 
     /**
-     * Called when this node transitions from subscribed to unsubscribed.
+     * Called for every unsubscribe.
+     *
+     * @param topic      Will not be null.
+     * @param child      Can be null.
+     * @param subscriber Will not be null.
+     */
+    protected void onUnsubscribe(DSTopic topic, DSInfo child, DSISubscriber subscriber) {
+    }
+
+    /**
+     * Called when this node transitions to having no subscriptions of any kind.
      */
     protected void onUnsubscribed() {
     }
 
+    /**
+     * Called when the child and topic pair transitions to having no subscriptions.
+     *
+     * @param topic Can not be null.
+     * @param child Can be null.
+     */
+    protected void onUnsubscribed(DSTopic topic, DSInfo child) {
+    }
+
     /**
      * Adds or replaces the named child.  If adding, add(String,DSIObject) will be called.
      *
@@ -961,6 +914,60 @@ public DSInfo put(String name, DSIObject object) {
         return info;
     }
 
+    /**
+     * A convenience for put(String, DSIObject)
+     *
+     * @return The info for the child.
+     */
+    public DSInfo put(String name, boolean arg) {
+        return put(name, DSBool.valueOf(arg));
+    }
+
+    /**
+     * A convenience for put(String, DSIObject)
+     *
+     * @return The info for the child.
+     */
+    public DSInfo put(String name, double arg) {
+        return put(name, DSDouble.valueOf(arg));
+    }
+
+    /**
+     * A convenience for put(String, DSIObject)
+     *
+     * @return The info for the child.
+     */
+    public DSInfo put(String name, float arg) {
+        return put(name, DSFloat.valueOf(arg));
+    }
+
+    /**
+     * A convenience for put(String, DSIObject)
+     *
+     * @return The info for the child.
+     */
+    public DSInfo put(String name, int arg) {
+        return put(name, DSInt.valueOf(arg));
+    }
+
+    /**
+     * A convenience for put(String, DSIObject)
+     *
+     * @return The info for the child.
+     */
+    public DSInfo put(String name, long arg) {
+        return put(name, DSLong.valueOf(arg));
+    }
+
+    /**
+     * A convenience for put(String, DSIObject)
+     *
+     * @return The info for the child.
+     */
+    public DSInfo put(String name, String arg) {
+        return put(name, DSString.valueOf(arg));
+    }
+
     /**
      * Replaces the child.
      *
@@ -988,7 +995,6 @@ public DSNode put(DSInfo info, DSIObject object) {
         } else if (old instanceof DSGroup) {
             ((DSGroup) object).setParent(null);
         }
-        info.unsubscribe();
         info.setObject(object);
         if (argIsNode) {
             argAsNode.infoInParent = info;
@@ -996,13 +1002,13 @@ public DSNode put(DSInfo info, DSIObject object) {
         if (isRunning()) {
             if (argIsNode) {
                 argAsNode.start();
-            }
-            info.subscribe();
-            childChanged(info);
-            if (isStable()) {
-                if (argIsNode) {
-                    argAsNode.stable();
+            } else {
+                try {
+                    onChildChanged(info);
+                } catch (Exception x) {
+                    error(getPath(), x);
                 }
+                fire(VALUE_TOPIC, DSValueTopic.Event.CHILD_CHANGED, info);
             }
         }
         return this;
@@ -1021,7 +1027,7 @@ public DSNode remove(DSInfo info) {
         if (info.getParent() != this) {
             throw new IllegalStateException("Not a child of this container");
         }
-        synchronized (this) {
+        synchronized (mutex) {
             if (childMap != null) {
                 childMap.remove(info.getName());
                 if (childMap.size() < MAP_THRESHOLD) {
@@ -1048,19 +1054,19 @@ public DSNode remove(DSInfo info) {
             node.infoInParent = null;
             node.stop();
         }
-        info.unsubscribe();
         if (isRunning()) {
             try {
                 onChildRemoved(info);
             } catch (Exception x) {
-                severe(getPath(), x);
+                error(getPath(), x);
             }
-            if (subscriber != null) {
-                try {
-                    subscriber.onEvent(this, info, CHILD_REMOVED);
-                } catch (Exception x) {
-                    severe(getPath(), x);
+            fire(INFO_TOPIC, DSInfoTopic.Event.CHILD_REMOVED, info);
+            Subscription sub = subscription;
+            while (sub != null) {
+                if (sub.shouldUnsubscribe(info)) {
+                    unsubscribe(sub.topic, info, sub.subscriber);
                 }
+                sub = sub.next;
             }
         }
         return this;
@@ -1081,33 +1087,6 @@ public DSInfo remove(String name) {
         return info;
     }
 
-    /**
-     * There can be multiple subscribers but will only call onSubscribed when the node transitions
-     * from unsubscribed to subscribed.
-     */
-    public void subscribe(DSISubscriber arg) {
-        boolean first = false;
-        synchronized (this) {
-            if (subscriber == null) {
-                subscriber = arg;
-                first = true;
-            } else if (subscriber instanceof SubscriberAdapter) {
-                ((SubscriberAdapter) subscriber).subscribe(arg);
-            } else {
-                SubscriberAdapter adapter = new SubscriberAdapter(subscriber);
-                subscriber = adapter;
-                adapter.subscribe(arg);
-            }
-        }
-        if (first) {
-            try {
-                onSubscribed();
-            } catch (Exception x) {
-                severe(getPath(), x);
-            }
-        }
-    }
-
     /** TODO later
      * Reorder the child to be first.
      public void reorderToFirst(DSInfo info) {
@@ -1156,7 +1135,7 @@ public final void stable() {
         try {
             onStable();
         } catch (Exception x) {
-            DSLogging.getDefaultLogger().log(Level.FINE, getPath(), x);
+            error(getPath(), x);
         }
     }
 
@@ -1173,11 +1152,6 @@ public final void start() {
             if (info.isNode()) {
                 info.getNode().start();
             }
-            try {
-                info.subscribe();
-            } catch (Exception x) {
-                severe(getPath(), x);
-            }
             info = info.next();
         }
         state = DSUtil.setBit(state, STATE_STOPPED, false);
@@ -1185,7 +1159,7 @@ public final void start() {
         try {
             onStarted();
         } catch (Exception x) {
-            DSLogging.getDefaultLogger().log(Level.FINE, getPath(), x);
+            error(getPath(), x);
         }
     }
 
@@ -1200,18 +1174,87 @@ public final void stop() {
         path = null;
         DSInfo info = getFirstInfo();
         while (info != null) {
-            info.unsubscribe();
             if (info.isNode()) {
                 info.getNode().stop();
             }
             info = info.next();
         }
+        Subscription sub = subscription;
+        while (sub != null) {
+            sub.unsubscribe();
+            sub = sub.next;
+        }
+        subscription = null;
         state = DSUtil.setBit(state, STATE_STABLE, false);
         state = DSUtil.setBit(state, STATE_STOPPED, true);
         try {
             onStopped();
         } catch (Exception x) {
-            DSLogging.getDefaultLogger().log(Level.FINE, getPath(), x);
+            fine(getPath(), x);
+        }
+    }
+
+    /**
+     * Subscribes the child and topic.
+     *
+     * @param topic      Can not be null.
+     * @param child      Can be null, and cannot be a child node.
+     * @param subscriber Can not be null.
+     */
+    public void subscribe(DSTopic topic, DSInfo child, DSISubscriber subscriber) {
+        if (child != null) {
+            if (child.isNode()) {
+                throw new IllegalArgumentException("Must subscribe nodes directly");
+            }
+        }
+        if (subscriber == null) {
+            throw new NullPointerException("Null subscriber");
+        }
+        if (topic == null) {
+            throw new NullPointerException("Null topic");
+        }
+        boolean firstSubscription;
+        int count = 0;
+        synchronized (mutex) {
+            Subscription sub = subscription;
+            firstSubscription = (sub == null);
+            Subscription prev = null;
+            while (sub != null) {
+                if (sub.equals(child, topic)) {
+                    count++;
+                    if (DSUtil.equal(subscriber, sub.subscriber)) {
+                        return;
+                    }
+                }
+                prev = sub;
+                sub = sub.next;
+            }
+            sub = new Subscription(child, subscriber, topic);
+            if (prev == null) {
+                sub.next = subscription;
+                subscription = sub;
+            } else {
+                prev.next = sub;
+            }
+        }
+        try {
+            onSubscribe(topic, child, subscriber);
+        } catch (Exception x) {
+            error(getParent(), x);
+        }
+        if (count == 0) {
+            try {
+                onSubscribed(topic, child);
+            } catch (Exception x) {
+                error(getParent(), x);
+            }
+        }
+        if (firstSubscription) {
+            try {
+                onSubscribed();
+            } catch (Exception x) {
+                error(getParent(), x);
+            }
         }
     }
 
@@ -1223,29 +1266,56 @@ protected static DSNode toNode(Object obj) {
     }
 
     /**
-     * There can be multiple subscribers but this will only call onUnsubscribed when the node
-     * transitions from subscribed to unsubscribed.
-     */
-    public void unsubscribe(DSISubscriber arg) {
-        synchronized (this) {
-            if (arg == null) {
-                return;
-            } else if (subscriber instanceof SubscriberAdapter) {
-                SubscriberAdapter adapter = (SubscriberAdapter) subscriber;
-                adapter.unsubscribe(arg);
-                if (adapter.isEmpty()) {
-                    subscriber = null;
+     * Unsubscribes the tuple.
+     *
+     * @param topic      Can not be null.
+     * @param child      Can be null.
+     * @param subscriber Can not be null.
+     */
+    public void unsubscribe(DSTopic topic, DSInfo child, DSISubscriber subscriber) {
+        int count = 0;
+        Subscription removed = null;
+        synchronized (mutex) {
+            Subscription sub = subscription;
+            Subscription prev = null;
+            while (sub != null) {
+                if (sub.equals(child, topic)) {
+                    count++;
+                    if (DSUtil.equal(subscriber, sub.subscriber)) {
+                        count--;
+                        removed = sub;
+                        if (prev == null) {
+                            subscription = subscription.next;
+                        } else {
+                            prev.next = sub.next;
+                        }
+                    }
                 }
-            } else if (subscriber == arg) {
-                subscriber = null;
+                prev = sub;
+                sub = sub.next;
             }
         }
-        if (subscriber == null) {
+        if (removed != null) {
             try {
-                onUnsubscribed();
+                onUnsubscribe(topic, child, subscriber);
             } catch (Exception x) {
-                severe(getPath(), x);
+                error(getParent(), x);
             }
+            if (count == 0) {
+                try {
+                    onUnsubscribed(topic, child);
+                } catch (Exception x) {
+                    error(getParent(), x);
+                }
+            }
+            if (subscription == null) {
+                try {
+                    onUnsubscribed();
+                } catch (Exception x) {
+                    error(getParent(), x);
+                }
+            }
+            removed.unsubscribe();
         }
     }
 
@@ -1293,7 +1363,7 @@ public void remove() {
             }
             DSNode.this.remove(last);
         }
-    }
+    } //ChildIterator
 
     /**
      * Iterates only node children. Does not support the remove operation.
@@ -1327,7 +1397,54 @@ public void remove() {
             }
             DSNode.this.remove(last);
         }
-    }
+    } //NodeIterator
+
+    private class Subscription {
+
+        DSInfo child;
+        Subscription next;
+        DSISubscriber subscriber;
+        DSTopic topic;
+
+        Subscription(DSInfo child, DSISubscriber subscriber, DSTopic topic) {
+            this.child = child;
+            this.subscriber = subscriber;
+            this.topic = topic;
+        }
+
+        boolean equals(DSInfo child, DSTopic topic) {
+            if (!DSUtil.equal(topic, this.topic)) {
+                return false;
+            }
+            return DSUtil.equal(child, this.child);
+        }
+
+        boolean shouldFire(DSInfo child, DSTopic topic) {
+            if (!DSUtil.equal(topic, this.topic)) {
+                return false;
+            }
+            if (topic == VALUE_TOPIC) {
+                return DSUtil.equal(child, this.child);
+            }
+            return true;
+        }
+
+        boolean shouldUnsubscribe(DSInfo child) {
+            if (topic == VALUE_TOPIC) {
+                return DSUtil.equal(child, this.child);
+            }
+            return false;
+        }
+
+        void unsubscribe() {
+            try {
+                subscriber.onUnsubscribed(topic, DSNode.this, child);
+            } catch (Exception x) {
+                error(getPath(), x);
+            }
+        }
+
+    } //Subscription
 
     /**
      * Iterates only value children.
@@ -1361,10 +1478,6 @@ public void remove() {
             }
             DSNode.this.remove(last);
         }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
+    } //ValueIterator
 
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSNull.java b/dslink-core/src/main/java/org/iot/dsa/node/DSNull.java
index 2cef07e2..fbb24963 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSNull.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSNull.java
@@ -1,8 +1,8 @@
 package org.iot.dsa.node;
 
 /**
- * This is used for decoding raw json.  Try to use strong typed null instances instead (e.g.
- * DBool.NULL).
+ * Try not to use, it is for decoding raw json.  Try to use strong typed null instances instead
+ * (e.g. DBool.NULL).
  *
  * @author Aaron Hansen
  */
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSPath.java b/dslink-core/src/main/java/org/iot/dsa/node/DSPath.java
index 4d71aea2..1491296b 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSPath.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSPath.java
@@ -37,10 +37,40 @@ public DSPath(String path) {
     // Methods in alphabetical order
     ///////////////////////////////////////////////////////////////////////////
 
+    /**
+     * Concatenates the two paths into the given bucket.  Insures a single forward slash character
+     * separates them. The bucket will not be cleared, the path will be appended to it.
+     *
+     * @param bucket Can be null, in which case a new buffer will be created.
+     * @return The given bucket, or a new one if that was null, with the complete path appended.
+     */
+    public static StringBuilder concat(String leading, String trailing, StringBuilder bucket) {
+        if (bucket == null) {
+            bucket = new StringBuilder();
+        }
+        if ((leading != null) && !leading.isEmpty()) {
+            bucket.append(leading);
+        }
+        if ((trailing == null) || trailing.isEmpty()) {
+            return bucket;
+        }
+        if (leading.charAt(leading.length() - 1) == '/') {
+            if (trailing.charAt(0) == '/') {
+                bucket.append(trailing.substring(1));
+            }
+        } else {
+            if (trailing.charAt(0) != '/') {
+                bucket.append('/');
+                bucket.append(trailing);
+            }
+        }
+        return bucket;
+    }
+
     /**
      * Un-escapes a name.
      */
-    public static String decodePathName(String pathName) {
+    public static String decodeName(String pathName) {
         boolean modified = false;
         int len = pathName.length();
         StringBuilder sb = new StringBuilder(len > 500 ? len / 2 : len);
@@ -92,32 +122,48 @@ public static String decodePathName(String pathName) {
      * Splits the path and decodes each individual name.
      */
     public static String[] decodePath(String path) {
+        if (path == null) {
+            return new String[0];
+        }
         String[] elems = splitPath(path);
         for (int i = 0, len = elems.length; i < len; i++) {
-            elems[i] = decodePathName(elems[i]);
+            elems[i] = decodeName(elems[i]);
         }
         return elems;
     }
 
     /**
-     * Ascends the tree and creates pretty printing path.
-     public static String encodeDisplayPath(DSNode node) {
-     ArrayList<DSNode> nodes = new ArrayList<DSNode>();
-     while (node != null) {
-     if (node.getName() != null) {
-     nodes.add(node);
-     break;
-     }
-     node = node.getParent();
-     }
-     StringBuilder builder = new StringBuilder();
-     for (int i = nodes.size(); --i >= 0; ) {
-     builder.append('/');
-     builder.append(node.getName());
-     }
-     return builder.toString();
-     }
+     * Creates a properly encoded path from the given names.
+     *
+     * @param leadingSlash Whether or not to prepend a slash to the path.
+     * @param names        The names to encode in the given order.
+     * @return A properly encoded path name.
+     */
+    public static String encodePath(boolean leadingSlash, String... names) {
+        return encodePath(leadingSlash, names, names.length);
+    }
+
+    /**
+     * Creates a properly encoded path from the given names.
+     *
+     * @param leadingSlash Whether or not to prepend a slash to the path.
+     * @param names        The names to encode in the given order.
+     * @param len          The number of elements from the names array to use start at index 0.
+     * @return A properly encoded path name.
      */
+    public static String encodePath(boolean leadingSlash, String[] names, int len) {
+        StringBuilder builder = new StringBuilder();
+        if (leadingSlash) {
+            builder.append('/');
+        }
+        for (int i = 0; i < len; i++) {
+            if (i > 0) {
+                builder.append('/');
+            }
+            encodeName(names[i], builder);
+        }
+        return builder.toString();
+    }
 
     /**
      * Ascends the tree and encodes all the node names into a path.
@@ -145,7 +191,7 @@ public static String encodePath(DSNode node) {
      */
     public static String encodeName(String name) {
         StringBuilder builder = new StringBuilder();
-        if (encodeName(name, builder)) {
+        if (encodeName(name, builder, false)) {
             return builder.toString();
         }
         return name;
@@ -160,19 +206,46 @@ public static String encodeName(String name) {
      * @return True if the name was modified in any way.
      */
     public static boolean encodeName(String name, StringBuilder buf) {
+        return encodeName(name, buf, false);
+    }
+
+    /**
+     * Encodes a DSA v1 name for use outside of a path.
+     *
+     * @return True if the name was modified in any way.
+     */
+    public static boolean encodeNameV1(String name, StringBuilder buf) {
+        return encodeName(name, buf, true);
+    }
+
+    /**
+     * Encodes a name.
+     *
+     * @param name The raw un-encoded name.
+     * @param buf  When to put the encoded name.  Characters will be put into the buf no matter
+     *             what.
+     * @param v1   True if for v1.
+     * @return True if the name was modified in any way.
+     */
+    private static boolean encodeName(String name, StringBuilder buf, boolean v1) {
         if (name == null) {
             return false;
         }
         boolean modified = false;
         int pathLength = name.length();
-        CharArrayWriter charArrayWriter = new CharArrayWriter();
+        CharArrayWriter charArrayWriter = null;
         char c;
+        boolean encode = false;
         for (int i = 0; i < pathLength; ) {
             c = name.charAt(i);
-            if (!shouldEncode(c)) {
-                buf.append((char) c);
+            encode = v1 ? shouldEncodeV1(c) : shouldEncode(c);
+            if (!encode) {
+                buf.append(c);
                 i++;
             } else {
+                if (charArrayWriter == null) {
+                    charArrayWriter = new CharArrayWriter();
+                }
                 do {
                     charArrayWriter.write(c);
                     if (c >= 0xD800 && c <= 0xDBFF) {
@@ -237,21 +310,38 @@ public String[] getPathElements() {
     /**
      * Returns true for characters that should be encoded.
      */
-    public static boolean shouldEncode(int ch) {
+    private static boolean shouldEncode(int ch) {
         switch (ch) {
             case '.':
             case '/':
             case '\\':
+            case '\'':
+            case '"':
             case '?':
             case '*':
-            case ':':
-            case '"':
+            case '|':
             case '<':
             case '>':
+            case '=':
+            case ':':
+            case ';':
             case '%':
                 return true;
             default:
-                return false;
+                return ch < 0x20;
+        }
+    }
+
+    /**
+     * Returns true for characters that should be encoded.
+     */
+    private static boolean shouldEncodeV1(int ch) {
+        switch (ch) {
+            case '/':
+            case '%':
+                return true;
+            default:
+                return ch < 0x20;
         }
     }
 
@@ -286,12 +376,4 @@ public static String[] splitPath(String path) {
         return path.split("/");
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSStatus.java b/dslink-core/src/main/java/org/iot/dsa/node/DSStatus.java
index a37c6126..3c2c5151 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSStatus.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSStatus.java
@@ -62,7 +62,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSStatus extends DSValue implements DSIStatus {
+public class DSStatus extends DSValue implements DSIStatus, DSIStorable {
 
     ///////////////////////////////////////////////////////////////////////////
     // Constants
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSString.java b/dslink-core/src/main/java/org/iot/dsa/node/DSString.java
index 8f9cfc24..1ce354bd 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSString.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSString.java
@@ -47,6 +47,9 @@ public boolean equals(Object o) {
             return true;
         }
         if (!(o instanceof DSElement)) {
+            if (o instanceof String) {
+                return value.equals(o.toString());
+            }
             return false;
         }
         DSElement obj = (DSElement) o;
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSValue.java b/dslink-core/src/main/java/org/iot/dsa/node/DSValue.java
index c60cdafe..e1ebe58e 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/DSValue.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSValue.java
@@ -7,18 +7,6 @@
  */
 public abstract class DSValue implements DSIValue {
 
-    // Constants
-    // ---------
-
-    // Fields
-    // ------
-
-    // Constructors
-    // ------------
-
-    // Public Methods
-    // --------------
-
     /**
      * Returns this.
      */
@@ -27,22 +15,6 @@ public DSIValue copy() {
         return this;
     }
 
-    /**
-     * Calls valueOf(arg).
-     */
-    @Override
-    public DSIValue restore(DSElement arg) {
-        return valueOf(arg);
-    }
-
-    /**
-     * Calls toElement()
-     */
-    @Override
-    public DSElement store() {
-        return toElement();
-    }
-
     /**
      * If isNull(), returns "null", otherwise returns toElement().toString()
      */
@@ -54,10 +26,4 @@ public String toString() {
         return toElement().toString();
     }
 
-    // Inner Classes
-    // --------------
-
-    // Initialization
-    // --------------
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/DSValueNode.java b/dslink-core/src/main/java/org/iot/dsa/node/DSValueNode.java
new file mode 100644
index 00000000..36fa598b
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/DSValueNode.java
@@ -0,0 +1,54 @@
+package org.iot.dsa.node;
+
+import org.iot.dsa.node.event.DSValueTopic.Event;
+
+/**
+ * A convenience implementation of a node that is also a value.  The value of the node must be
+ * stored as a child.  Subclasses only need to override is getValueChild()
+ *
+ * @author Aaron Hansen
+ * @see DSValueNode#getValueChild()
+ */
+public abstract class DSValueNode extends DSNode implements DSIValue {
+
+    /**
+     * This fires the NODE_CHANGED topic when the value child changes.  Overrides should call
+     * super.onChildChanged.
+     */
+    @Override
+    public void onChildChanged(DSInfo child) {
+        DSInfo info = getValueChild();
+        if (child == info) {
+            DSIValue val = info.getValue();
+            fire(VALUE_TOPIC, Event.NODE_CHANGED, null);
+        }
+    }
+
+    @Override
+    public DSValueType getValueType() {
+        return getValueChild().getValue().getValueType();
+    }
+
+    /**
+     * Subclasses must store the node value in a child value and provide the info for that child
+     * here.  This method will be called often, it would be best to cache the info instance
+     * rather then doing a name lookup each time.
+     */
+    public abstract DSInfo getValueChild();
+
+    @Override
+    public DSElement toElement() {
+        return getValueChild().getValue().toElement();
+    }
+
+    @Override
+    public void onSet(DSIValue value) {
+        put(getValueChild(), value);
+    }
+
+    @Override
+    public DSIValue valueOf(DSElement element) {
+        return getValueChild().getValue().valueOf(element);
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/SubscriberAdapter.java b/dslink-core/src/main/java/org/iot/dsa/node/SubscriberAdapter.java
deleted file mode 100644
index c5d6fc59..00000000
--- a/dslink-core/src/main/java/org/iot/dsa/node/SubscriberAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.iot.dsa.node;
-
-import java.util.concurrent.ConcurrentLinkedQueue;
-import org.iot.dsa.logging.DSLogger;
-
-/**
- * Multiplexes events to multiple subscribers.
- *
- * @author Aaron Hansen
- */
-class SubscriberAdapter extends DSLogger implements DSISubscriber {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private ConcurrentLinkedQueue<DSISubscriber> subscribers =
-            new ConcurrentLinkedQueue<DSISubscriber>();
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    SubscriberAdapter() {
-    }
-
-    SubscriberAdapter(DSISubscriber first) {
-        subscribers.add(first);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods in alphabetical order
-    ///////////////////////////////////////////////////////////////////////////
-
-    public boolean isEmpty() {
-        return subscribers.isEmpty();
-    }
-
-    public void onEvent(DSIObject publisher, DSInfo child, DSIPublisher.Event event) {
-        for (DSISubscriber subscriber : subscribers) {
-            try {
-                subscriber.onEvent(publisher, child, event);
-            } catch (Exception x) {
-                severe(subscriber.toString(), x);
-            }
-        }
-    }
-
-    public void subscribe(DSISubscriber subscriber) {
-        if (!subscribers.contains(subscriber)) {
-            subscribers.add(subscriber);
-        }
-    }
-
-    public void unsubscribe(DSISubscriber subscriber) {
-        subscribers.remove(subscriber);
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/action/DSAction.java b/dslink-core/src/main/java/org/iot/dsa/node/action/DSAction.java
index c15f35cc..c312b777 100644
--- a/dslink-core/src/main/java/org/iot/dsa/node/action/DSAction.java
+++ b/dslink-core/src/main/java/org/iot/dsa/node/action/DSAction.java
@@ -15,6 +15,11 @@
 /**
  * Fully describes an action and routes invocations to DSNode.onInvoke.
  *
+ * <b>Permissions</b>
+ * Permissions are determined using info flags.  If the admin flag is set,
+ * the action requires admin level permissions. If the action is readonly, then only read
+ * permissions are required.  Otherwise the action will require write permissions.
+ *
  * @author Aaron Hansen
  * @see org.iot.dsa.node.DSNode#onInvoke(DSInfo, ActionInvocation)
  */
@@ -53,7 +58,7 @@ public DSAction copy() {
 
     /**
      * A convenience which calls addParameter with the same arguments, and also sets the metadata
-     * for default value.
+     * for the default value.
      *
      * @param name        Must not be null.
      * @param value       Must not be null.
@@ -69,7 +74,7 @@ public DSMetadata addDefaultParameter(String name, DSIValue value, String descri
 
     /**
      * Fully describes a parameter for method invocation.  At the very least, the map should have a
-     * unique name and a value type, use the metadata utility class to build the map.
+     * unique name and a value type.  You should use the metadata utility class to build the map.
      *
      * @return This.
      * @see DSMetadata
@@ -195,14 +200,21 @@ public DSMetadata addValueResult(String name, DSValueType type) {
     @Override
     public Iterator<DSMap> getParameters() {
         if (parameters != null) {
-            return parameters.iterator();
+            ArrayList<DSMap> tmp = new ArrayList<DSMap>(parameters.size());
+            tmp.addAll(parameters);
+            return tmp.iterator();
         }
         return null;
     }
 
+    /**
+     * Not used.  Permissions are determined using info flags.  If the admin flag is set,
+     * the action requires admin level permissions. If the action is readonly, then only read
+     * permissions are required.  Otherwise the action will require write permissions.
+     */
     @Override
     public DSPermission getPermission() {
-        return permission;
+        return DSPermission.WRITE;
     }
 
     @Override
@@ -249,14 +261,14 @@ public boolean isNull() {
     }
 
     /**
-     * Returns this, it is not necessary to set the permission to read.
+     * Override point, called for each parameter as it is being sent to the requester.  Allows you
+     * for example, to use current values as defaults.
+     *
+     * @param info      The info about the action in it's parent container.  Never use the outer
+     *                  'this' of anonymous instances.
+     * @param parameter Map representing a single parameter.
      */
-    public DSAction setPermission(DSPermission permission) {
-        if (this == DEFAULT) {
-            throw new IllegalStateException("Cannot modify the default action.");
-        }
-        this.permission = permission;
-        return this;
+    public void prepareParameter(DSInfo info, DSMap parameter) {
     }
 
     /**
@@ -277,7 +289,7 @@ private void validate(DSMap params, List<DSMap> existing) {
         if (params.isEmpty()) {
             throw new IllegalArgumentException("Empty metadata");
         }
-        String name = params.getString("name");
+        String name = params.getString(DSMetadata.NAME);
         if ((name == null) || name.isEmpty()) {
             throw new IllegalArgumentException("Missing name");
         }
@@ -288,18 +300,10 @@ private void validate(DSMap params, List<DSMap> existing) {
             return;
         }
         for (DSMap param : existing) {
-            if (name.equals(param.getString("name"))) {
+            if (name.equals(param.getString(DSMetadata.NAME))) {
                 throw new IllegalArgumentException("Duplicate name: " + name);
             }
         }
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/action/DSActionValues.java b/dslink-core/src/main/java/org/iot/dsa/node/action/DSActionValues.java
new file mode 100644
index 00000000..6d6bc54f
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/action/DSActionValues.java
@@ -0,0 +1,56 @@
+package org.iot.dsa.node.action;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import org.iot.dsa.node.DSIValue;
+
+/**
+ * This is a convenience implementation of ActionValues.  It is for actions that return one or
+ * more values (not tables or streams).
+ *
+ * @author Aaron Hansen
+ */
+public class DSActionValues implements ActionValues {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSAction action;
+    private ArrayList<DSIValue> values = new ArrayList<DSIValue>();
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constructors
+    ///////////////////////////////////////////////////////////////////////////
+
+    public DSActionValues(DSAction action) {
+        this.action = action;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods in alphabetical order
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Values must be added in the same order they were defined in the action.
+     */
+    public DSActionValues addResult(DSIValue value) {
+        values.add(value);
+        return this;
+    }
+
+    public DSAction getAction() {
+        return action;
+    }
+
+    public Iterator<DSIValue> getValues() {
+        return values.iterator();
+    }
+
+    /**
+     * Does nothing.
+     */
+    public void onClose() {
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/event/DSIEvent.java b/dslink-core/src/main/java/org/iot/dsa/node/event/DSIEvent.java
new file mode 100644
index 00000000..3449d5c4
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/event/DSIEvent.java
@@ -0,0 +1,15 @@
+package org.iot.dsa.node.event;
+
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSNode;
+
+/**
+ * This is an empty interface, DSTopics are allowed to define events however they wish.
+ *
+ * @author Aaron Hansen
+ * @see DSISubscriber#onEvent(DSTopic, DSIEvent, DSNode, DSInfo, Object...)
+ * @see DSTopic
+ */
+public interface DSIEvent {
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/event/DSISubscriber.java b/dslink-core/src/main/java/org/iot/dsa/node/event/DSISubscriber.java
new file mode 100644
index 00000000..cbe0a944
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/event/DSISubscriber.java
@@ -0,0 +1,46 @@
+package org.iot.dsa.node.event;
+
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSNode;
+
+/**
+ * DSISubscribers subscribe to DSTopics on DSNodes.
+ * <p>
+ * A single topic can emanate multiple types of events.  The event object is an empty interface,
+ * each topic will define it's own events.
+ * <p>
+ * Events can also supply parameters.  The parameters specific to each kind of event.
+ * <p>
+ * See the class documentation of a specific topic to understand the possible events and their
+ * parameters.
+ * <p>
+ * The two most important topics are built into every node, they are: DSValueTopic and DSInfoTopic.
+ *
+ * @see DSIEvent
+ * @see DSTopic
+ * @see DSNode#subscribe(DSTopic, DSInfo, DSISubscriber)
+ */
+public interface DSISubscriber {
+
+    /**
+     * Subscription callback.
+     *
+     * @param topic  Required, the topic emanating the event.
+     * @param event  Required, the actual event.
+     * @param node   Required, node subscribed to.
+     * @param child  Optional, if the event concerns a child.
+     * @param params Can be null, only used if the event defines it.
+     */
+    public void onEvent(DSTopic topic, DSIEvent event, DSNode node, DSInfo child, Object... params);
+
+    /**
+     * Called no matter how the unsubscribe happens, whether explicitly or if the node
+     * unsubscribes itself.
+     *
+     * @param topic The topic that was passed to DSNode.subscribe.
+     * @param node  Node that was passed to DSNode.subscribe, never null.
+     * @param child The child that was passed to DSNode.subscribe, may be null.
+     */
+    public void onUnsubscribed(DSTopic topic, DSNode node, DSInfo child);
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/event/DSInfoTopic.java b/dslink-core/src/main/java/org/iot/dsa/node/event/DSInfoTopic.java
new file mode 100644
index 00000000..02433c82
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/event/DSInfoTopic.java
@@ -0,0 +1,42 @@
+package org.iot.dsa.node.event;
+
+/**
+ * This topic is for info related events on DSNodes.
+ * <p>
+ * Events will be on of the enum defined in the Event inner class.  The parameters for each event
+ * are defined in the documentation for each event.
+ *
+ * @author Aaron Hansen
+ */
+public class DSInfoTopic extends DSTopic {
+
+    /**
+     * The only instance of this topic.
+     *
+     * @see org.iot.dsa.node.DSNode#INFO_TOPIC
+     */
+    public static final DSInfoTopic INSTANCE = new DSInfoTopic();
+
+    // Prevent instantiation
+    private DSInfoTopic() {
+    }
+
+    /**
+     * The possible events for this topic.
+     */
+    public enum Event implements DSIEvent {
+        /**
+         * Events will have a single parameter, the info of the new child.
+         */
+        CHILD_ADDED,
+        /**
+         * Events will have a single parameter, the unparented info of the child.
+         */
+        CHILD_REMOVED,
+        /**
+         * TBD. Node? Child? Both?
+         */
+        METADATA_CHANGED
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/event/DSTopic.java b/dslink-core/src/main/java/org/iot/dsa/node/event/DSTopic.java
new file mode 100644
index 00000000..38009210
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/event/DSTopic.java
@@ -0,0 +1,51 @@
+package org.iot.dsa.node.event;
+
+import org.iot.dsa.node.DSIObject;
+import org.iot.dsa.node.DSInfo;
+
+/**
+ * DSISubscribers subscribe to DSTopics on DSNodes.
+ * <p>
+ * A single topic can emanate multiple types of events.  The event object is an empty interface,
+ * each topic will define it's own events.
+ * <p>
+ * Events can also supply parameters.  The parameters specific to each kind of event.
+ * <p>
+ * See the class documentation of a specific topic to understand the possible events and their
+ * parameters.
+ * <p>
+ * The two most important topics are built into every node, they are: DSValueTopic and DSInfoTopic.
+ *
+ * @see DSIEvent
+ * @see DSISubscriber
+ * @see DSInfoTopic
+ * @see DSValueTopic
+ * @see org.iot.dsa.node.DSNode#subscribe(DSTopic, DSInfo, DSISubscriber)
+ */
+public class DSTopic implements DSIObject {
+
+    /**
+     * Returns this.
+     */
+    @Override
+    public DSTopic copy() {
+        return this;
+    }
+
+    /**
+     * Only test instance equality.
+     */
+    @Override
+    public boolean isEqual(Object obj) {
+        return obj == this;
+    }
+
+    /**
+     * False
+     */
+    @Override
+    public boolean isNull() {
+        return false;
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/node/event/DSValueTopic.java b/dslink-core/src/main/java/org/iot/dsa/node/event/DSValueTopic.java
new file mode 100644
index 00000000..b696b7fa
--- /dev/null
+++ b/dslink-core/src/main/java/org/iot/dsa/node/event/DSValueTopic.java
@@ -0,0 +1,39 @@
+package org.iot.dsa.node.event;
+
+/**
+ * This topic is for change of value events on DSNodes.  There are two types of events,
+ * NODE_CHANGED for nodes that implement DSIValue and CHILD_CHANGED for child values of the
+ * subscribed node.
+ * <p>
+ * Events will be one of the enums defined in the Event inner class.
+ *
+ * @author Aaron Hansen
+ */
+public class DSValueTopic extends DSTopic implements DSIEvent {
+
+    /**
+     * The only instance of this topic.
+     *
+     * @see org.iot.dsa.node.DSNode#VALUE_TOPIC
+     */
+    public static final DSValueTopic INSTANCE = new DSValueTopic();
+
+    // Prevent instantiation
+    private DSValueTopic() {
+    }
+
+    /**
+     * The possible events from this topic.
+     */
+    public enum Event implements DSIEvent {
+        /**
+         * For DSNodes that implement DSIValue.  The DSInfo arg to onEvent must be null.
+         */
+        NODE_CHANGED,
+        /**
+         * For node value children (who are not also nodes).  The DSInfo arg must not be null.
+         */
+        CHILD_CHANGED
+    }
+
+}
diff --git a/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordAes.java b/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordAes.java
index e10271d4..abd6a738 100644
--- a/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordAes.java
+++ b/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordAes.java
@@ -7,6 +7,7 @@
 import javax.crypto.spec.SecretKeySpec;
 import org.iot.dsa.io.DSBase64;
 import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSIStorable;
 import org.iot.dsa.node.DSRegistry;
 import org.iot.dsa.node.DSString;
 import org.iot.dsa.node.DSValue;
@@ -18,7 +19,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSPasswordAes extends DSValue implements DSIPassword {
+public class DSPasswordAes extends DSValue implements DSIPassword, DSIStorable {
 
     // Constants
     // ---------
@@ -146,9 +147,17 @@ public boolean isValid(String clearText) {
         return value.toString().equals(encode(clearText));
     }
 
+    @Override
+    public DSString store() {
+        return toElement();
+    }
+
     @Override
     public DSPasswordAes restore(DSElement element) {
-        return new DSPasswordAes((DSString) element);
+        if (element.isNull()) {
+            return NULL;
+        }
+        return new DSPasswordAes(element.toString());
     }
 
     /**
diff --git a/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordSha256.java b/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordSha256.java
index a48d5fe3..0c296ba7 100644
--- a/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordSha256.java
+++ b/dslink-core/src/main/java/org/iot/dsa/security/DSPasswordSha256.java
@@ -5,6 +5,7 @@
 import java.util.logging.Logger;
 import org.iot.dsa.io.DSBase64;
 import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSIStorable;
 import org.iot.dsa.node.DSRegistry;
 import org.iot.dsa.node.DSString;
 import org.iot.dsa.node.DSValue;
@@ -15,7 +16,7 @@
  *
  * @author Aaron Hansen
  */
-public class DSPasswordSha256 extends DSValue implements DSIPassword {
+public class DSPasswordSha256 extends DSValue implements DSIPassword, DSIStorable {
 
     // Constants
     // ---------
@@ -127,9 +128,17 @@ public boolean isValid(String clearText) {
         return value.toString().equals(encode(clearText));
     }
 
+    @Override
+    public DSString store() {
+        return toElement();
+    }
+
     @Override
     public DSPasswordSha256 restore(DSElement element) {
-        return new DSPasswordSha256((DSString) element);
+        if (element.isNull()) {
+            return NULL;
+        }
+        return new DSPasswordSha256(element.toString());
     }
 
     /**
diff --git a/dslink-core/src/main/java/org/iot/dsa/security/DSPermission.java b/dslink-core/src/main/java/org/iot/dsa/security/DSPermission.java
index 4c437189..b3f449c7 100644
--- a/dslink-core/src/main/java/org/iot/dsa/security/DSPermission.java
+++ b/dslink-core/src/main/java/org/iot/dsa/security/DSPermission.java
@@ -8,10 +8,10 @@
 public enum DSPermission {
 
     //Write permission NEVER = 0;
-    LIST("list", 1),
-    READ("read", 2),
-    WRITE("write", 3),
-    CONFIG("config", 4);
+    LIST("list", 0x1),
+    READ("read", 0x2),
+    WRITE("write", 0x3),
+    CONFIG("config", 0x4);
 
     private String display;
     private int level;
@@ -29,6 +29,13 @@ public boolean isConfig() {
         return this == CONFIG;
     }
 
+    /**
+     * True if this level is higher than the given.
+     */
+    public boolean isGreaterThan(DSPermission arg) {
+        return level >= arg.getLevel();
+    }
+
     public boolean isRead() {
         return this == READ;
     }
@@ -41,18 +48,32 @@ public boolean isList() {
         return this == LIST;
     }
 
+    public static DSPermission forString(String str) {
+        for (DSPermission p : DSPermission.values()) {
+            if (p.toString().equalsIgnoreCase(str)) {
+                return p;
+            }
+        }
+        throw new IllegalArgumentException("Unknown permission: " + str);
+    }
+
     @Override
     public String toString() {
         return display;
     }
 
-    public static DSPermission forString(String str) {
-        for (DSPermission p : DSPermission.values()) {
-            if (p.toString().equals(str)) {
-                return p;
-            }
+    public static DSPermission valueOf(int v2byte) {
+        switch (v2byte) {
+            case 0x10:
+                return LIST;
+            case 0x20:
+                return READ;
+            case 0x30:
+                return WRITE;
+            case 0x40:
+                return CONFIG;
         }
-        return null;
+        throw new IllegalArgumentException("Unknown permission: " + v2byte);
     }
 
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/time/DSTime.java b/dslink-core/src/main/java/org/iot/dsa/time/DSTime.java
index 75cfdd92..18d7ba43 100644
--- a/dslink-core/src/main/java/org/iot/dsa/time/DSTime.java
+++ b/dslink-core/src/main/java/org/iot/dsa/time/DSTime.java
@@ -715,6 +715,15 @@ public static StringBuilder encodeForLogs(Calendar calendar, StringBuilder buf)
             buf.append('0');
         }
         buf.append(tmp);
+        buf.append(tmp).append(':');
+        tmp = calendar.get(Calendar.MILLISECOND);
+        if (tmp < 100) {
+            buf.append('0');
+        }
+        if (tmp < 10) {
+            buf.append('0');
+        }
+        buf.append(tmp);
         return buf;
     }
 
@@ -750,6 +759,14 @@ public static Calendar getCalendar(long timestamp) {
         return cal;
     }
 
+    public static long millisToNanos(long millis) {
+        return millis * NANOS_IN_MS;
+    }
+
+    public static long nanosToMillis(long nanos) {
+        return nanos / NANOS_IN_MS;
+    }
+
     /**
      * Return a calendar instance for reuse.
      */
diff --git a/dslink-core/src/main/java/org/iot/dsa/util/DSException.java b/dslink-core/src/main/java/org/iot/dsa/util/DSException.java
index b2c54db6..03790a61 100644
--- a/dslink-core/src/main/java/org/iot/dsa/util/DSException.java
+++ b/dslink-core/src/main/java/org/iot/dsa/util/DSException.java
@@ -16,7 +16,7 @@ public class DSException extends RuntimeException {
     // Constructors
     /////////////////////////////////////////////////////////////////
 
-    public DSException(Exception inner) {
+    public DSException(Throwable inner) {
         this.inner = inner;
     }
 
@@ -44,6 +44,31 @@ public StackTraceElement[] getStackTrace() {
         return inner.getStackTrace();
     }
 
+    /**
+     * Attempts come up with the best description of the argument.
+     */
+    public static String makeMessage(Throwable t) {
+        if (t.getCause() != null) {
+            return makeMessage(t.getCause());
+        }
+        String message = t.getMessage();
+        if ((message == null) || message.trim().isEmpty()) {
+            return t.toString();
+        }
+        return message;
+    }
+
+    /**
+     * If the given exception is already a runtime exception, it is cast and returned,
+     * otherwise it will be returned wrapped by an instance of this class.
+     */
+    public static RuntimeException makeRuntime(Throwable x) {
+        if (x instanceof RuntimeException) {
+            return (RuntimeException) x;
+        }
+        return new DSException(x);
+    }
+
     @Override
     public void printStackTrace() {
         inner.printStackTrace();
@@ -65,14 +90,11 @@ public Throwable initCause(Throwable cause) {
     }
 
     /**
-     * If the given exception is already a runtime exception, it is rethrown, otherwise it will be
-     * thrown wrapped by an instance of this class.
+     * If the given exception is already a runtime exception, it is rethrown, otherwise
+     * it will be thrown wrapped by an instance of this class.
      */
-    public static void throwRuntime(Exception x) {
-        if (x instanceof RuntimeException) {
-            throw (RuntimeException) x;
-        }
-        throw new DSException(x);
+    public static void throwRuntime(Throwable x) {
+        throw makeRuntime(x);
     }
 
     public String toString() {
@@ -80,33 +102,9 @@ public String toString() {
     }
 
     /////////////////////////////////////////////////////////////////
-    // Methods - Protected and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Package and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Private and in alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes - in alphabetical order by class name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Constants - in alphabetical order by field name.
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Facets - in alphabetical order by field name.
+    // Fields - in alphabetical order by field name.
     /////////////////////////////////////////////////////////////////
 
-    private Exception inner;
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
+    private Throwable inner;
 
 }
diff --git a/dslink-core/src/main/java/org/iot/dsa/util/DSUtil.java b/dslink-core/src/main/java/org/iot/dsa/util/DSUtil.java
index 139b0e53..f9d518e1 100644
--- a/dslink-core/src/main/java/org/iot/dsa/util/DSUtil.java
+++ b/dslink-core/src/main/java/org/iot/dsa/util/DSUtil.java
@@ -7,27 +7,11 @@
  */
 public class DSUtil {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Constructors
-    /////////////////////////////////////////////////////////////////
-
     private DSUtil() {
     }
 
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
     /**
-     * Comparison that takes null into account.  Null == null.
+     * Comparison that takes null into account; null == null.
      */
     public static boolean equal(Object o1, Object o2) {
         if (o1 == o2) {
@@ -69,12 +53,4 @@ public static int setBit(int bits, int index, boolean set) {
         return bits;
     }
 
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/DSByteBufferTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/DSByteBufferTest.java
index 99e5814f..b5f21c7f 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/DSByteBufferTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/DSByteBufferTest.java
@@ -1,6 +1,7 @@
 package org.iot.dsa.dslink;
 
-import org.iot.dsa.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import java.nio.ByteBuffer;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -9,28 +10,14 @@
  */
 public class DSByteBufferTest {
 
-    // Constants
-    // ---------
-
-    // Fields
-    // ------
-
-    // Constructors
-    // ------------
-
-    // Methods
-    // -------
-
     @Test
     public void theTest() throws Exception {
         DSByteBuffer buffer = new DSByteBuffer(5);
-        Assert.assertFalse(buffer.isOpen());
-        buffer.open();
         Assert.assertTrue(buffer.available() == 0);
         byte[] tmp = new byte[]{1, 2, 3, 4, 5};
         buffer.put(tmp, 0, tmp.length);
         Assert.assertTrue(buffer.available() == tmp.length);
-        int len = buffer.read(tmp, 0, tmp.length);
+        int len = buffer.sendTo(tmp, 0, tmp.length);
         Assert.assertTrue(len == tmp.length);
         Assert.assertArrayEquals(tmp, new byte[]{1, 2, 3, 4, 5});
         buffer.put(tmp, 0, tmp.length);
@@ -63,8 +50,52 @@ public void theTest() throws Exception {
         Assert.assertTrue(buffer.read() == 3);
     }
 
-// Inner Classes
-// -------------
-//
+    @Test
+    public void comparisonTest() {
+        ByteBuffer javaBuf = ByteBuffer.allocate(1024);
+        javaBuf.put((byte) 1);
+        DSByteBuffer dsBuf = new DSByteBuffer();
+        dsBuf.put((byte) 1);
+        byte[] dsry = dsBuf.toByteArray();
+        byte[] jary = toByteArray(javaBuf);
+        Assert.assertEquals(dsry.length, jary.length);
+        Assert.assertArrayEquals(dsry, jary);
+        //double
+        javaBuf.putDouble(12345.6);
+        dsBuf.putDouble(12345.6);
+        dsry = dsBuf.toByteArray();
+        jary = toByteArray(javaBuf);
+        Assert.assertEquals(dsry.length, jary.length);
+        Assert.assertArrayEquals(dsry, jary);
+        //int
+        javaBuf.putInt(12345);
+        dsBuf.putInt(12345);
+        dsry = dsBuf.toByteArray();
+        jary = toByteArray(javaBuf);
+        Assert.assertEquals(dsry.length, jary.length);
+        Assert.assertArrayEquals(dsry, jary);
+        //long
+        javaBuf.putLong(12345);
+        dsBuf.putLong(12345);
+        dsry = dsBuf.toByteArray();
+        jary = toByteArray(javaBuf);
+        Assert.assertEquals(dsry.length, jary.length);
+        Assert.assertArrayEquals(dsry, jary);
+        //short
+        javaBuf.putShort((short) 123);
+        dsBuf.putShort((short) 123);
+        dsry = dsBuf.toByteArray();
+        jary = toByteArray(javaBuf);
+        Assert.assertEquals(dsry.length, jary.length);
+        Assert.assertArrayEquals(dsry, jary);
+    }
+
+    private byte[] toByteArray(ByteBuffer buf) {
+        byte[] ret = new byte[buf.position()];
+        buf.flip();
+        buf.get(ret);
+        buf.clear();
+        return ret;
+    }
 
 }
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/DSElementTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/DSElementTest.java
index f0ce8959..c6cf20fb 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/DSElementTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/DSElementTest.java
@@ -8,6 +8,7 @@
 import org.iot.dsa.node.DSElementType;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
+import org.iot.dsa.time.DSTime;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -16,17 +17,21 @@
  */
 public class DSElementTest {
 
-    // Constants
-    // ---------
-
-    // Fields
-    // ------
-
-    // Constructors
-    // ------------
-
-    // Methods
-    // -------
+    @Test
+    public void tmp() throws Exception {
+        System.out.println("max: " + Long.MAX_VALUE);
+        System.out.println("min: " + Long.MAX_VALUE);
+        long time = System.nanoTime();
+        System.out.println("now: " + time);
+        time /= DSTime.NANOS_IN_MS;
+        System.out.println("now millis: " + time);
+        time /= 60000;
+        System.out.println("now minutes: " + time);
+        System.out.println("currentTimeMIllis: " + System.currentTimeMillis());
+        long tmp = Long.MAX_VALUE - 2;
+        tmp += 3;
+        System.out.println("rollover: " + tmp);
+    }
 
     @Test
     public void test() throws Exception {
@@ -42,7 +47,7 @@ public void test() throws Exception {
         test(DSElement.make(""), "");
         test(DSElement.make("0"), "0");
         test(DSElement.make("abc"), "abc");
-        testNull(DSElement.make((String)null));
+        testNull(DSElement.make((String) null));
         testNull(DSElement.makeNull());
         testMap();
     }
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/DSFlexEnumTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/DSFlexEnumTest.java
index c9cc8c27..c443ea2e 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/DSFlexEnumTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/DSFlexEnumTest.java
@@ -51,7 +51,6 @@ public void theTest() throws Exception {
         }
     }
 
-
     // Inner Classes
     // -------------
 
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/DSPathTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/DSPathTest.java
new file mode 100644
index 00000000..3d6da47e
--- /dev/null
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/DSPathTest.java
@@ -0,0 +1,27 @@
+package org.iot.dsa.dslink;
+
+import org.iot.dsa.node.DSPath;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Aaron Hansen
+ */
+public class DSPathTest {
+
+    @Test
+    public void testAttribute() throws Exception {
+        String path = "/main/Node/@attr";
+        String attr = null;
+        int idx = 1 + path.lastIndexOf('/');
+        if (path.charAt(idx) == '@') {
+            String[] elems = DSPath.decodePath(path);
+            idx = elems.length - 1;
+            attr = elems[idx];
+            path = DSPath.encodePath(path.charAt(0) == '/', elems, idx);
+        }
+        Assert.assertTrue(attr.equals("@attr"));
+        Assert.assertTrue(path.equals("/main/Node"));
+    }
+
+}
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/LoggingTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/LoggingTest.java
index 801606dc..960e1ae6 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/LoggingTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/LoggingTest.java
@@ -25,7 +25,7 @@ private void aMethod() {
         log.exiting("LoggingTest", "aMethod");
     }
 
-    @Test
+    //@Test
     public void test1() throws Exception {
         Logger.getLogger("").info("My first log");
         log.info("My second log");
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/MetadataTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/MetadataTest.java
new file mode 100644
index 00000000..c7ab175b
--- /dev/null
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/MetadataTest.java
@@ -0,0 +1,79 @@
+package org.iot.dsa.dslink;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import org.iot.dsa.io.NodeDecoder;
+import org.iot.dsa.io.NodeEncoder;
+import org.iot.dsa.io.json.JsonReader;
+import org.iot.dsa.io.json.JsonWriter;
+import org.iot.dsa.node.DSFlexEnum;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSList;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSMetadata;
+import org.iot.dsa.node.DSNode;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Aaron Hansen
+ */
+public class MetadataTest {
+
+    // Fields
+    // ------
+
+    private static DSMetadata metadata = new DSMetadata();
+
+    // Methods
+    // -------
+
+    private DSNode decode(byte[] bytes) throws Exception {
+        ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
+        JsonReader reader = new JsonReader(bin, "UTF-8");
+        DSNode ret = NodeDecoder.decode(reader);
+        reader.close();
+        return ret;
+    }
+
+    private byte[] encode(DSNode node) throws Exception {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        JsonWriter writer = new JsonWriter(bos);
+        NodeEncoder.encode(writer, node);
+        writer.close();
+        return bos.toByteArray();
+    }
+
+    @Test
+    public void theTest() throws Exception {
+        DSNode node = new DSNode();
+        DSInfo info = node.put("enum", DSFlexEnum.valueOf("abc", DSList.valueOf("abc", "def")));
+        DSMap meta = DSMetadata.getMetadata(info, null);
+        metadata.setMap(meta);
+        Assert.assertEquals(2, metadata.getEnumRange().size());
+        Assert.assertTrue(metadata.getEnumRange().get(0).equals("abc"));
+        Assert.assertTrue(metadata.getEnumRange().get(1).equals("def"));
+        meta.clear();
+        node = new MyNode();
+        info = node.put("enum", DSFlexEnum.valueOf("abc", DSList.valueOf("abc", "def")));
+        DSMetadata.getMetadata(info, meta);
+        Assert.assertEquals(3, metadata.getEnumRange().size());
+        Assert.assertTrue(metadata.getEnumRange().get(0).equals("abc"));
+        Assert.assertTrue(metadata.getEnumRange().get(1).equals("def"));
+        Assert.assertTrue(metadata.getEnumRange().get(2).equals("ghi"));
+    }
+
+    // Inner Classes
+    // -------------
+
+    public static class MyNode extends DSNode {
+
+        @Override
+        public void getMetadata(DSInfo info, DSMap bucket) {
+            DSList list = metadata.getEnumRange();
+            list.add("ghi");
+        }
+    }
+
+
+}
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/MsgpackTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/MsgpackTest.java
index 02450608..a710093f 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/MsgpackTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/MsgpackTest.java
@@ -1,5 +1,7 @@
 package org.iot.dsa.dslink;
 
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackReader;
+import com.acuity.iot.dsa.dslink.io.msgpack.MsgpackWriter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
@@ -7,9 +9,6 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
 import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.io.msgpack.MsgpackReader;
-import org.iot.dsa.io.msgpack.MsgpackWriter;
 import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSString;
@@ -21,18 +20,6 @@
  */
 public class MsgpackTest {
 
-    // Constants
-    // ---------
-
-    // Fields
-    // ------
-
-    // Constructors
-    // ------------
-
-    // Methods
-    // -------
-
     @Test
     public void testStrings() throws Exception {
         String input = "He wes Leovenaðes sone -- liðe him be Drihten.";
@@ -64,19 +51,15 @@ public void testStrings() throws Exception {
 
     @Test
     public void theTest() throws Exception {
-        final ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
-        DSIWriter out = new MsgpackWriter() {
-            @Override
-            public DSIWriter flush() {
-                writeTo(baos1);
-                return this;
-            }
+        MsgpackWriter tmp = new MsgpackWriter();
+        tmp.beginList();
+        tmp.value("abc");
+        tmp.endList();
+        DSIReader reader = new MsgpackReader(new ByteArrayInputStream(tmp.toByteArray()));
+        reader.getElement().toList();
 
-            @Override
-            public void close() {
-                flush();
-            }
-        };
+        final ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
+        MsgpackWriter out = new MsgpackWriter();
         out.beginList();
         out.value("abc");
         out.value(10);
@@ -85,8 +68,9 @@ public void close() {
         out.value(new DSMap());
         out.value(new DSList());
         out.endList();
-        out.reset();
-        byte[] encoded = baos1.toByteArray();
+        //out.writeTo(baos1);
+        //out.reset();
+        byte[] encoded = out.toByteArray();
         DSIReader parser = new MsgpackReader(new ByteArrayInputStream(encoded));
         DSList list = parser.getElement().toList();
         parser.close();
@@ -96,18 +80,7 @@ public void close() {
         Assert.assertTrue(list.get(2).toBoolean());
         Assert.assertEquals(list.get(3).toDouble(), 10.1d, 0);
         final ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
-        out = new MsgpackWriter() {
-            @Override
-            public DSIWriter flush() {
-                writeTo(baos2);
-                return this;
-            }
-
-            @Override
-            public void close() {
-                flush();
-            }
-        };
+        out = new MsgpackWriter();
         out.beginMap();
         out.key("first").value("abc");
         out.key("second").value(10);
@@ -127,6 +100,7 @@ public void close() {
         }
         out.key("seventh").value("somebytes".getBytes());
         out.endMap();
+        out.writeTo(baos2);
         out.reset();
         encoded = baos2.toByteArray();
         parser = new MsgpackReader(new ByteArrayInputStream(encoded));
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/PerfTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/PerfTest.java
new file mode 100644
index 00000000..d62f6c91
--- /dev/null
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/PerfTest.java
@@ -0,0 +1,127 @@
+package org.iot.dsa.dslink;
+
+import org.iot.dsa.node.DSBool;
+import org.iot.dsa.node.DSDouble;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSInt;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSString;
+import org.iot.dsa.node.action.DSAction;
+
+/**
+ * @author Aaron Hansen
+ */
+public class PerfTest {
+
+    private static final boolean WITH_DEFAULTS = true;
+    private DSNode root;
+
+    private String format(long mem) {
+        return (mem / 1000) + "KB";
+    }
+
+    private void iterate(DSNode node) {
+        DSInfo info = node.getFirstInfo();
+        while (info != null) {
+            if (info.isNode()) {
+                iterate(info.getNode());
+            }
+            info = info.next();
+        }
+    }
+
+    private DSNode makeNode() {
+        if (WITH_DEFAULTS) {
+            return new TestNode();
+        }
+        DSNode ret = new DSNode();
+        ret.put("string", "abc");
+        ret.put("int", DSInt.valueOf(1000));
+        ret.put("double", DSDouble.valueOf(12345.1d));
+        ret.put("boolean", DSBool.valueOf(true));
+        return ret;
+    }
+
+    private long memoryUsed() {
+        Runtime rt = Runtime.getRuntime();
+        long mem = rt.totalMemory() - rt.freeMemory();
+        long tmp;
+        for (int i = 2; --i >= 0; ) {
+            System.gc();
+            tmp = rt.totalMemory() - rt.freeMemory();
+            if (tmp < mem) {
+                mem = tmp;
+            }
+            try {
+                Thread.sleep(1000);
+            } catch (Exception x) {
+                x.printStackTrace();
+            }
+            tmp = rt.totalMemory() - rt.freeMemory();
+            if (tmp < mem) {
+                mem = tmp;
+            }
+        }
+        return mem;
+    }
+
+    //@Test
+    public void execute() {
+        System.out.println("\nStarting " + new java.util.Date());
+        System.out.println("Test (1/3)...");
+        test(false);
+        System.out.println("Test (2/3)...");
+        test(false);
+        System.out.println("Test (3/3)...");
+        test(true);
+        System.out.println("\nFinished " + new java.util.Date());
+    }
+
+    public void test(boolean print) {
+        root = null;
+        long before = memoryUsed();
+        if (print) {
+            System.out.println("Memory before: " + format(before));
+        }
+        long time = System.currentTimeMillis();
+        root = makeNode();
+        for (int i = 0; i < 10; i++) {
+            DSNode iNode = makeNode();
+            root.add("test" + i, iNode);
+            for (int j = 0; j < 100; j++) {
+                DSNode jNode = makeNode();
+                iNode.add("test" + j, jNode);
+                for (int k = 0; k < 100; k++) {
+                    jNode.add("test" + k, makeNode());
+                }
+            }
+        }
+        time = System.currentTimeMillis() - time;
+        long after = memoryUsed();
+        if (print) {
+            System.out.println("Memory after: " + format(after));
+            System.out.println("Memory used: " + format(after - before));
+            System.out.println("Create time: " + time + "ms");
+        }
+        time = System.currentTimeMillis();
+        iterate(root);
+        time = System.currentTimeMillis() - time;
+        after = memoryUsed();
+        if (print) {
+            System.out.println("Iterate time: " + time + "ms");
+            System.out.println("Memory used: " + format(after - before));
+        }
+    }
+
+    public static class TestNode extends DSNode {
+
+        public void declareDefaults() {
+            super.declareDefaults();
+            declareDefault("string", DSString.valueOf("abc"));
+            declareDefault("int", DSInt.valueOf(1000));
+            declareDefault("double", DSDouble.valueOf(12345.1d));
+            declareDefault("boolean", DSBool.valueOf(true));
+            declareDefault("action", DSAction.DEFAULT);
+        }
+    }
+}
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterInvokeTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterInvokeTest.java
new file mode 100644
index 00000000..a935bc9e
--- /dev/null
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterInvokeTest.java
@@ -0,0 +1,122 @@
+package org.iot.dsa.dslink;
+
+import com.acuity.iot.dsa.dslink.test.TestLink;
+import org.iot.dsa.dslink.requester.SimpleInvokeHandler;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSInt;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSValueType;
+import org.iot.dsa.node.action.ActionInvocation;
+import org.iot.dsa.node.action.ActionResult;
+import org.iot.dsa.node.action.DSAction;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Aaron Hansen
+ */
+public class RequesterInvokeTest implements DSLinkConnection.Listener {
+
+    // Fields
+    // ------
+
+    private static boolean success = false;
+    private DSLink link;
+    private MyMain root;
+
+    // Methods
+    // -------
+
+    public void onConnect(DSLinkConnection connection) {
+        DSIRequester requester = link.getConnection().getRequester();
+        success = true;
+        synchronized (this) {
+            notifyAll();
+        }
+    }
+
+    public void onDisconnect(DSLinkConnection connection) {
+    }
+
+    @Test
+    public void theTest() throws Exception {
+        link = new TestLink(root = new MyMain());
+        link.getConnection().addListener(this);
+        Thread t = new Thread(link, "DSLink Runner");
+        t.start();
+        success = false;
+        synchronized (this) {
+            this.wait(5000);
+        }
+        Assert.assertTrue(success);
+        success = false;
+        DSIRequester requester = link.getConnection().getRequester();
+        SimpleInvokeHandler res = (SimpleInvokeHandler) requester.invoke(
+                "/main/simpleAction", null, new SimpleInvokeHandler());
+        res.getResult(1000);
+        res = (SimpleInvokeHandler) requester.invoke(
+                "/main/simpleParam",
+                new DSMap().put("param", true),
+                new SimpleInvokeHandler());
+        res.getResult(1000);
+        Assert.assertTrue(success);
+        res = (SimpleInvokeHandler) requester.invoke(
+                "/main/exception",
+                new DSMap().put("param", true),
+                new SimpleInvokeHandler());
+        success = false;
+        try {
+            res.getResult(1000);
+        } catch (Exception x) {
+            success = true;
+        }
+        Assert.assertTrue(success);
+    }
+
+    // Inner Classes
+    // -------------
+
+    public static class MyMain extends DSMainNode {
+
+        @Override
+        public void declareDefaults() {
+            declareDefault("anode", new ANode());
+            declareDefault("simpleAction", DSAction.DEFAULT);
+            DSAction action = new DSAction();
+            action.addParameter("param", DSValueType.BOOL, "a desc");
+            declareDefault("simpleParam", action);
+            declareDefault("exception", DSAction.DEFAULT);
+        }
+
+        @Override
+        public ActionResult onInvoke(DSInfo action, ActionInvocation invocation) {
+            String name = action.getName();
+            if (name.equals("simpleAction")) {
+                success = true;
+            } else if (name.equals("simpleParam")) {
+                DSMap params = invocation.getParameters();
+                success = params.get("param", false);
+            } else if (name.equals("exception")) {
+                throw new IllegalStateException("my message");
+            }
+            return null;
+        }
+
+    }
+
+    public static class ANode extends DSNode {
+
+        @Override
+        public void declareDefaults() {
+            declareDefault("int", DSInt.valueOf(0));
+        }
+
+        @Override
+        public ActionResult onInvoke(DSInfo action, ActionInvocation invocation) {
+            return null;
+        }
+
+    }
+
+}
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterSubscribeTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterSubscribeTest.java
index 5fe365e0..96f50c81 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterSubscribeTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/RequesterSubscribeTest.java
@@ -1,12 +1,14 @@
 package org.iot.dsa.dslink;
 
 import com.acuity.iot.dsa.dslink.test.TestLink;
-import org.iot.dsa.DSRuntime;
 import org.iot.dsa.dslink.requester.AbstractSubscribeHandler;
+import org.iot.dsa.dslink.requester.ErrorType;
 import org.iot.dsa.dslink.requester.SimpleRequestHandler;
 import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSInt;
 import org.iot.dsa.node.DSStatus;
+import org.iot.dsa.node.DSValueNode;
 import org.iot.dsa.time.DSDateTime;
 import org.junit.Assert;
 import org.junit.Test;
@@ -21,7 +23,7 @@ public class RequesterSubscribeTest implements DSLinkConnection.Listener {
 
     private boolean success = false;
     private DSLink link;
-    private MyRoot root;
+    private MyMain root;
     private AbstractSubscribeHandler handler;
 
     // Methods
@@ -31,10 +33,17 @@ public void onConnect(DSLinkConnection connection) {
         DSIRequester requester = link.getConnection().getRequester();
         success = !root.isSubscribed();
         handler = (AbstractSubscribeHandler) requester.subscribe(
-                "/Nodes/int", 0, new AbstractSubscribeHandler() {
+                "/main/int", 0, new AbstractSubscribeHandler() {
+                    boolean first = true;
+
                     @Override
                     public void onUpdate(DSDateTime dateTime, DSElement value, DSStatus status) {
-                        success = value.equals(DSInt.valueOf(10));
+                        if (first) {
+                            success = value.equals(DSInt.valueOf(0));
+                            first = false;
+                        } else {
+                            success = value.equals(DSInt.valueOf(10));
+                        }
                         synchronized (RequesterSubscribeTest.this) {
                             RequesterSubscribeTest.this.notify();
                         }
@@ -49,11 +58,10 @@ public void onClose() {
                     }
 
                     @Override
-                    public void onError(String type, String msg, String detail) {
+                    public void onError(ErrorType type, String msg) {
                         Thread.dumpStack();
                     }
                 });
-        requester.set("/Nodes/int", DSInt.valueOf(10), SimpleRequestHandler.DEFAULT);
     }
 
     public void onDisconnect(DSLinkConnection connection) {
@@ -61,37 +69,130 @@ public void onDisconnect(DSLinkConnection connection) {
 
     @Test
     public void theTest() throws Exception {
-        link = new TestLink(root = new MyRoot());
+        link = new TestLink(root = new MyMain());
         link.getConnection().addListener(this);
-        DSRuntime.run(link);
+        Thread t = new Thread(link, "DSLink Runner");
+        t.start();
         Assert.assertFalse(root.isSubscribed());
+        Assert.assertFalse(success);
+        //Wait for onConnected to subscribe and receive the first update value of 0
         synchronized (this) {
             this.wait(5000);
         }
         Assert.assertTrue(success);
         Assert.assertTrue(root.isSubscribed());
+        //Set the value to 10 and wait for the update
         success = false;
+        DSIRequester requester = link.getConnection().getRequester();
+        requester.set("/main/int", DSInt.valueOf(10), SimpleRequestHandler.DEFAULT);
+        synchronized (this) {
+            this.wait(5000);
+        }
+        Assert.assertTrue(success);
+        Assert.assertEquals(root.get("int"), DSInt.valueOf(10));
+        success = false;
+        //Close stream, validate onClose called
         handler.getStream().closeStream();
         Assert.assertTrue(success);
         synchronized (root) {
             root.wait(5000);
         }
+        //Validate that the root was unsubscribed
         Assert.assertFalse(root.isSubscribed());
-        link.stop();
+        //Subscribe a lower value, validate onSubscribe.
+        ANode node = (ANode) root.getNode("aNode");
+        testChild(requester);
+        //Test the same path, but different instance.
+        root.remove("aNode");
+        Assert.assertTrue(node.isStopped());
+        root.put("aNode", new ANode());
+        testChild(requester);
+        link.shutdown();
         link = null;
     }
 
+    private void testChild(DSIRequester requester) throws Exception {
+        ANode node = (ANode) root.getNode("aNode");
+        AbstractSubscribeHandler handler = (AbstractSubscribeHandler) requester.subscribe(
+                "/main/aNode", 0, new AbstractSubscribeHandler() {
+                    @Override
+                    public void onUpdate(DSDateTime dateTime, DSElement value, DSStatus status) {
+                    }
+
+                    @Override
+                    public void onClose() {
+                    }
+
+                    @Override
+                    public void onError(ErrorType type, String msg) {
+                    }
+                });
+        synchronized (node) {
+            if (!node.subscribeCalled) {
+                node.wait(5000);
+            }
+        }
+        Assert.assertTrue(node.subscribeCalled);
+        Assert.assertTrue(node.isSubscribed());
+        //Now close the stream and validate unsubscribed.
+        Assert.assertFalse(node.unsubscribeCalled);
+        handler.getStream().closeStream();
+        synchronized (node) {
+            if (!node.unsubscribeCalled) {
+                node.wait(5000);
+            }
+        }
+        Assert.assertTrue(node.unsubscribeCalled);
+        Assert.assertFalse(node.isSubscribed());
+    }
+
     // Inner Classes
     // -------------
 
-    public static class MyRoot extends DSRootNode {
+    public static class MyMain extends DSMainNode {
 
         public void declareDefaults() {
             declareDefault("int", DSInt.valueOf(0));
         }
 
+        @Override
+        public synchronized void onSubscribed() {
+        }
+
+        @Override
+        public synchronized void onUnsubscribed() {
+            notifyAll();
+        }
+
+        public synchronized void onStable() {
+            put("aNode", new ANode());
+        }
+
+    }
+
+    public static class ANode extends DSValueNode {
+
+        public boolean subscribeCalled = false;
+        public boolean unsubscribeCalled = false;
+
+        public void declareDefaults() {
+            declareDefault("int", DSInt.valueOf(0));
+        }
+
+        @Override
+        public DSInfo getValueChild() {
+            return getInfo("int");
+        }
+
+        @Override
+        public synchronized void onSubscribed() {
+            subscribeCalled = true;
+            notifyAll();
+        }
+
         @Override
         public synchronized void onUnsubscribed() {
+            unsubscribeCalled = true;
             notifyAll();
         }
 
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/SerializationTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/SerializationTest.java
index e1b6fdbd..2a3f9028 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/SerializationTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/SerializationTest.java
@@ -8,10 +8,11 @@
 import org.iot.dsa.io.NodeEncoder;
 import org.iot.dsa.io.json.JsonReader;
 import org.iot.dsa.io.json.JsonWriter;
+import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSFloat;
 import org.iot.dsa.node.DSInt;
 import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSLong;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSString;
 import org.junit.Assert;
@@ -103,6 +104,16 @@ public void testMultipleGroups() throws Exception {
         Assert.assertTrue("f".equals(list.getString(2)));
     }
 
+    @Test
+    public void differentTypeThanDefault() throws Exception {
+        DSNode node = new MyNode();
+        node.put("tmp", DSElement.make(10));
+        node.put("string", DSLong.valueOf(6));
+        node = decode(encode(node));
+        Assert.assertEquals(node.get("string"), DSLong.valueOf(6));
+        Assert.assertEquals(node.get("tmp"), DSElement.make(10));
+    }
+
     // Inner Classes
     // -------------
 
@@ -112,6 +123,7 @@ public static class MyNode extends DSNode {
         public void declareDefaults() {
             declareDefault("int", DSInt.valueOf(1));
             declareDefault("node", new DSNode());
+            declareDefault("string", DSString.EMPTY);
         }
     }
 }
diff --git a/dslink-core/src/test/java/org/iot/dsa/dslink/V2HandshakeTest.java b/dslink-core/src/test/java/org/iot/dsa/dslink/V2HandshakeTest.java
index d31d3ae4..1a02e85e 100644
--- a/dslink-core/src/test/java/org/iot/dsa/dslink/V2HandshakeTest.java
+++ b/dslink-core/src/test/java/org/iot/dsa/dslink/V2HandshakeTest.java
@@ -1,14 +1,15 @@
 package org.iot.dsa.dslink;
 
-import java.io.IOException;
+import com.acuity.iot.dsa.dslink.io.DSByteBuffer;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageReader;
+import com.acuity.iot.dsa.dslink.protocol.v2.DS2MessageWriter;
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.util.Arrays;
 import javax.xml.bind.DatatypeConverter;
-import org.iot.dsa.io.DSByteBuffer;
 import org.iot.dsa.security.DSKeys;
 import org.junit.Assert;
 import org.junit.Test;
@@ -24,14 +25,6 @@ public class V2HandshakeTest {
 
     private final static char[] HEXCHARS = "0123456789abcdef".toCharArray();
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
     ///////////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////////
@@ -67,7 +60,7 @@ public void test() throws Exception {
         testF0(); //link->broker
         testF1(); //broker->link
         testF2(); //link->broker
-        testF3(); //link->broker
+        testF3(); //broker->link
     }
 
     public void testF0() throws Exception {
@@ -77,36 +70,24 @@ public void testF0() throws Exception {
         sbuf.append("mylink-").append(dsKeys.encodePublicHashDsId());
         String dsId = sbuf.toString();
         Assert.assertTrue(dsId.equals("mylink-TTDXtL-U_NQ2sgFRU5w0HrZVib2D-O4CxXQrKk4hUsI"));
-        byte[] dsIdBytes = dsId.getBytes("UTF-8");
         //client salt
         String saltHex = "c4ca4238a0b923820dcc509a6f75849bc81e728d9d4c2f636f067f89cc14862c";
         byte[] saltBytes = toBytesFromHex(saltHex);
         Assert.assertTrue(saltBytes.length == 32);
-        //generate f0 message
-        DSByteBuffer buf = new DSByteBuffer().open();
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{15, 0});
-        buf.put((byte) 0xf0);
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{0, 0, 0, 0});
-        //end of header
-        buf.put(new byte[]{2, 0});
-        byte[] bytes = new byte[4];
-        writeShort(bytes, 0, dsIdBytes.length);
-        buf.put(bytes, 0, 2);
-        buf.put(dsIdBytes);
-        buf.put(dsKeys.encodePublic());
-        buf.put((byte) 0);
-        buf.put(saltBytes);
-        writeInt(bytes, 0, buf.length());
-        buf.put(0, bytes, 0, 4);
-        //the final message byte array
-        bytes = buf.toByteArray();
+        //construct the message
+        DS2MessageWriter writer = new DS2MessageWriter();
+        writer.setMethod((byte) 0xf0);
+        DSByteBuffer buffer = writer.getBody();
+        buffer.put((byte) 2).put((byte) 0); //dsa version
+        writer.writeString(dsId, buffer);
+        buffer.put(dsKeys.encodePublic());
+        buffer.put(saltBytes);
+        byte[] bytes = writer.toByteArray();
         //what to test against
-        String correctResult = "a70000000f00f00000000000000000020032006d796c696e6b2d54544458744c2d555f4e5132736746525535773048725a56696232442d4f3443785851724b6b34685573490415caf59c92efecb9253ea43912b419941fdb59a23d5d1289027128bf3d6ee4cb86fbe251b675a8d9bd991a65caa1bb23f8a8e0dd4eb0974f6b1eaa3436cec0e900c4ca4238a0b923820dcc509a6f75849bc81e728d9d4c2f636f067f89cc14862c"
+        String correctResult = "9e0000000700f0020032006d796c696e6b2d54544458744c2d555f4e5132736746525535773048725a56696232442d4f3443785851724b6b34685573490415caf59c92efecb9253ea43912b419941fdb59a23d5d1289027128bf3d6ee4cb86fbe251b675a8d9bd991a65caa1bb23f8a8e0dd4eb0974f6b1eaa3436cec0e9c4ca4238a0b923820dcc509a6f75849bc81e728d9d4c2f636f067f89cc14862c"
                 .toUpperCase();
         byte[] correctBytes = toBytesFromHex(correctResult);
-        Assert.assertTrue(Arrays.equals(bytes, correctBytes));
+        Assert.assertArrayEquals(bytes, correctBytes);
     }
 
     public void testF1() throws Exception {
@@ -116,34 +97,40 @@ public void testF1() throws Exception {
         sbuf.append("broker-").append(dsKeys.encodePublicHashDsId());
         String dsId = sbuf.toString();
         Assert.assertTrue(dsId.equals("broker-g675gaSQogzMxjJFvL7HsCbyS8B0Ly2_Abhkw_-g4iI"));
-        byte[] dsIdBytes = dsId.getBytes("UTF-8");
         //broker salt
         String saltHex = "eccbc87e4b5ce2fe28308fd9f2a7baf3a87ff679a2f3e71d9181a67b7542122c";
         byte[] saltBytes = toBytesFromHex(saltHex);
         Assert.assertTrue(saltBytes.length == 32);
-        //generate f0 message
-        DSByteBuffer buf = new DSByteBuffer().open();
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{15, 0});
-        buf.put((byte) 0xf1);
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{0, 0, 0, 0});
-        //end of header
-        byte[] bytes = new byte[4];
-        writeShort(bytes, 0, dsIdBytes.length);
-        buf.put(bytes, 0, 2);
-        buf.put(dsIdBytes);
-        buf.put(dsKeys.encodePublic());
-        buf.put(saltBytes);
-        writeInt(bytes, 0, buf.length());
-        buf.put(0, bytes, 0, 4);
-        //the final message byte array
-        bytes = buf.toByteArray();
+        //construct the message
+        DS2MessageWriter writer = new DS2MessageWriter();
+        writer.setMethod((byte) 0xf1);
+        DSByteBuffer buffer = writer.getBody();
+        //dsa version
+        writer.writeString(dsId, buffer);
+        byte[] publicKey = dsKeys.encodePublic();
+        buffer.put(publicKey);
+        buffer.put(saltBytes);
+        int bodyLength = buffer.length();
+        byte[] bytes = writer.toByteArray();
         //what to test against
-        String correctResult = "a40000000f00f10000000000000000320062726f6b65722d67363735676153516f677a4d786a4a46764c374873436279533842304c79325f4162686b775f2d6734694904f9e64edcec5ea0a645bd034e46ff209dd9fb21d8aba74a5531dc6dcbea28d696c6c9386d924ebc2f48092a1d6c8b2ca907005cca7e8d2a58783b8a765d8eb29deccbc87e4b5ce2fe28308fd9f2a7baf3a87ff679a2f3e71d9181a67b7542122c"
+        String correctResult = "9c0000000700f1320062726f6b65722d67363735676153516f677a4d786a4a46764c374873436279533842304c79325f4162686b775f2d6734694904f9e64edcec5ea0a645bd034e46ff209dd9fb21d8aba74a5531dc6dcbea28d696c6c9386d924ebc2f48092a1d6c8b2ca907005cca7e8d2a58783b8a765d8eb29deccbc87e4b5ce2fe28308fd9f2a7baf3a87ff679a2f3e71d9181a67b7542122c"
                 .toUpperCase();
         byte[] correctBytes = toBytesFromHex(correctResult);
-        Assert.assertTrue(Arrays.equals(bytes, correctBytes));
+        Assert.assertArrayEquals(bytes, correctBytes);
+        //validate reading
+        DS2MessageReader reader = new DS2MessageReader();
+        reader.init(new ByteArrayInputStream(bytes));
+        InputStream in = reader.getBody();
+        Assert.assertEquals(0xf1, reader.getMethod());
+        Assert.assertEquals(bodyLength, reader.getBodyLength());
+        String tmp = reader.readString(in);
+        Assert.assertEquals(dsId, tmp);
+        bytes = new byte[publicKey.length];
+        in.read(bytes);
+        Assert.assertArrayEquals(bytes, publicKey);
+        bytes = new byte[saltBytes.length];
+        in.read(bytes);
+        Assert.assertArrayEquals(bytes, saltBytes);
     }
 
     public void testF2() throws Exception {
@@ -152,48 +139,35 @@ public void testF2() throws Exception {
         Assert.assertTrue(pubKeyBytes.length == 65);
         DSKeys dsKeys = getLinkKeys();
         byte[] sharedSecret = dsKeys.generateSharedSecret(pubKeyBytes);
-        //System.out.println("Mine: " + toHexFromBytes(sharedSecret));
         byte[] validSharedSecret = toBytesFromHex(
                 "5f67b2cb3a0906afdcf5175ed9316762a8e18ce26053e8c51b760c489343d0d1");
         Assert.assertTrue(Arrays.equals(validSharedSecret, sharedSecret));
         String saltHex = "eccbc87e4b5ce2fe28308fd9f2a7baf3a87ff679a2f3e71d9181a67b7542122c";
         byte[] salt = toBytesFromHex(saltHex);
-        byte[] bytes = DSKeys.generateHmacSHA256Signature(salt, validSharedSecret);
+        byte[] auth = DSKeys.generateHmacSHA256Signature(salt, validSharedSecret);
         String validAuthString = "f58c10e212a82bf327a020679c424fc63e852633a53253119df74114fac8b2ba";
         byte[] validAuthBytes = toBytesFromHex(validAuthString);
-        Assert.assertTrue(Arrays.equals(bytes, validAuthBytes));
-        DSByteBuffer buf = new DSByteBuffer().open();
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{15, 0});
-        buf.put((byte) 0xf2);
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{0, 0, 0, 0});
-        //end of header
-        String clientToken = "sample_token_string";
-        byte[] tokenBytes = clientToken.getBytes("UTF-8");
-        byte[] lenBytes = new byte[4];
-        writeShort(lenBytes, 0, tokenBytes.length);
-        buf.put(lenBytes, 0, 2);
-        buf.put(tokenBytes);
-        buf.put((byte) 1);
-        buf.put((byte) 1);
-        buf.put((byte) 0);
-        buf.put(bytes);
-        writeInt(lenBytes, 0, buf.length());
-        buf.put(0, lenBytes, 0, 4);
-        bytes = buf.toByteArray();
+        Assert.assertTrue(Arrays.equals(auth, validAuthBytes));
+        //construct the message
+        DS2MessageWriter writer = new DS2MessageWriter();
+        writer.setMethod((byte) 0xf2);
+        DSByteBuffer buffer = writer.getBody();
+        writer.writeString("sample_token_string", buffer);
+        buffer.put((byte) 0x01); //isResponder
+        writer.writeString("", buffer); //blank server path
+        buffer.put(auth);
+        byte[] tmp = writer.toByteArray();
         //what to test against
-        String correctResult = "470000000f00f20000000000000000130073616d706c655f746f6b656e5f737472696e67010100f58c10e212a82bf327a020679c424fc63e852633a53253119df74114fac8b2ba"
+        String correctResult = "3f0000000700f2130073616d706c655f746f6b656e5f737472696e67010000f58c10e212a82bf327a020679c424fc63e852633a53253119df74114fac8b2ba"
                 .toUpperCase();
         byte[] correctBytes = toBytesFromHex(correctResult);
-        Assert.assertTrue(Arrays.equals(bytes, correctBytes));
+        Assert.assertArrayEquals(tmp, correctBytes);
     }
 
     public void testF3() throws Exception {
         DSKeys clientKeys = getLinkKeys();
         byte[] pubKeyBytes = clientKeys.encodePublic();
         Assert.assertTrue(pubKeyBytes.length == 65);
-
         DSKeys dsKeys = getBrokerKeys();
         byte[] sharedSecret = dsKeys.generateSharedSecret(pubKeyBytes);
         byte[] validSharedSecret = toBytesFromHex(
@@ -201,110 +175,35 @@ public void testF3() throws Exception {
         Assert.assertTrue(Arrays.equals(validSharedSecret, sharedSecret));
         String saltHex = "c4ca4238a0b923820dcc509a6f75849bc81e728d9d4c2f636f067f89cc14862c";
         byte[] salt = toBytesFromHex(saltHex);
-        byte[] bytes = DSKeys.generateHmacSHA256Signature(salt, validSharedSecret);
+        byte[] auth = DSKeys.generateHmacSHA256Signature(salt, validSharedSecret);
         String validAuthString = "e709059f1ebb84cfb8c34d53fdba7fbf20b1fe3dff8c343050d2b5c7c62be85a";
         byte[] validAuthBytes = toBytesFromHex(validAuthString);
-        Assert.assertTrue(Arrays.equals(bytes, validAuthBytes));
-        DSByteBuffer buf = new DSByteBuffer().open();
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{15, 0});
-        buf.put((byte) 0xf3);
-        buf.put(new byte[]{0, 0, 0, 0});
-        buf.put(new byte[]{0, 0, 0, 0});
-        //end of header
-        byte[] tmp = new byte[4];
-        String clientSessionId = "sampe-session-001";
-        writeShort(tmp, 0, clientSessionId.length());
-        buf.put(tmp, 0, 2);
-        buf.put(clientSessionId.getBytes("UTF-8"));
-
-        String clientPath = "/downstream/mlink1";
-        writeShort(tmp, 0, clientPath.length());
-        buf.put(tmp, 0, 2);
-        buf.put(clientPath.getBytes("UTF-8"));
-        buf.put(bytes);
-        writeInt(tmp, 0, buf.length());
-        buf.put(0, tmp, 0, 4);
-        tmp = buf.toByteArray();
+        Assert.assertTrue(Arrays.equals(auth, validAuthBytes));
+        //construct the message
+        DS2MessageWriter writer = new DS2MessageWriter();
+        writer.setMethod((byte) 0xf3);
+        DSByteBuffer buffer = writer.getBody();
+        buffer.put((byte) 1); // allow requester
+        writer.writeString("/downstream/mlink1", buffer);
+        buffer.put(auth);
+        int bodyLength = writer.getBodyLength();
+        byte[] tmp = writer.toByteArray();
         //what to test against
-        String correctResult = "560000000f00f30000000000000000110073616d70652d73657373696f6e2d30303112002f646f776e73747265616d2f6d6c696e6b31e709059f1ebb84cfb8c34d53fdba7fbf20b1fe3dff8c343050d2b5c7c62be85a"
+        String correctResult = "3c0000000700f30112002f646f776e73747265616d2f6d6c696e6b31e709059f1ebb84cfb8c34d53fdba7fbf20b1fe3dff8c343050d2b5c7c62be85a"
                 .toUpperCase();
         byte[] correctBytes = toBytesFromHex(correctResult);
-        System.out.println("Mine: " + toHexFromBytes(tmp));
-        System.out.println("His:  " + toHexFromBytes(correctBytes));
         Assert.assertTrue(Arrays.equals(tmp, correctBytes));
-    }
-
-    /**
-     * Read a 32-bit little endian integer value from the stream.
-     */
-    protected static int readInt(InputStream in) throws IOException {
-        return (in.read() << 0) +
-                (in.read() << 8) +
-                (in.read() << 16) +
-                (in.read() << 24);
-    }
-
-    /**
-     * Read a 32-bit little endian integer value from the array.
-     */
-    protected static int readInt(byte[] buf, int off) {
-        return (buf[off] << 0) +
-                (buf[++off] << 8) +
-                (buf[++off] << 16) +
-                (buf[++off] << 24);
-    }
-
-    /**
-     * Read a 16-bit little endian short value from the array.
-     */
-    protected static int readShort(byte[] buf, int off) {
-        return (buf[off] << 0) +
-                (buf[++off] << 8);
-    }
-
-    /**
-     * Read a 32-bit little endian integer value from the stream.
-     */
-    protected static int readShort(InputStream in) throws IOException {
-        return (in.read() << 0) +
-                (in.read() << 8);
-    }
-
-    /**
-     * Write a 32 bit little endian integer to the internal buffer.
-     */
-    protected static void writeInt(byte[] out, int off, int v) {
-        out[off] = (byte) ((v >>> 0) & 0xFF);
-        out[++off] = (byte) ((v >>> 8) & 0xFF);
-        out[++off] = (byte) ((v >>> 16) & 0xFF);
-        out[++off] = (byte) ((v >>> 24) & 0xFF);
-    }
-
-    /**
-     * Write a 32 bit little endian integer to the internal buffer.
-     */
-    protected static void writeInt(OutputStream out, int v) throws IOException {
-        out.write((v >>> 0) & 0xFF);
-        out.write((v >>> 8) & 0xFF);
-        out.write((v >>> 16) & 0xFF);
-        out.write((v >>> 24) & 0xFF);
-    }
-
-    /**
-     * Write a 16 bit little endian integer to the internal buffer.
-     */
-    protected static void writeShort(byte[] out, int off, int v) {
-        out[off] = (byte) ((v >>> 0) & 0xFF);
-        out[++off] = (byte) ((v >>> 8) & 0xFF);
-    }
-
-    /**
-     * Write a 16 bit little endian integer to the internal buffer.
-     */
-    protected static void writeShort(OutputStream out, int v) throws IOException {
-        out.write((v >>> 0) & 0xFF);
-        out.write((v >>> 8) & 0xFF);
+        //validate reading
+        DS2MessageReader reader = new DS2MessageReader();
+        reader.init(new ByteArrayInputStream(tmp));
+        InputStream in = reader.getBody();
+        Assert.assertEquals(0xf3, reader.getMethod());
+        Assert.assertEquals(bodyLength, reader.getBodyLength());
+        Assert.assertEquals(in.read(), 1); //allow requester
+        Assert.assertEquals("/downstream/mlink1", reader.readString(in));
+        tmp = new byte[auth.length];
+        in.read(tmp);
+        Assert.assertArrayEquals(tmp, auth);
     }
 
     public static byte[] toBytesFromHex(String s) {
@@ -315,12 +214,4 @@ public static String toHexFromBytes(byte[] bytes) {
         return DatatypeConverter.printHexBinary(bytes);
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
 }
diff --git a/dslink-java-v2-test/build.gradle b/dslink-java-v2-test/build.gradle
index 2b36b641..e1942a33 100644
--- a/dslink-java-v2-test/build.gradle
+++ b/dslink-java-v2-test/build.gradle
@@ -6,6 +6,9 @@ targetCompatibility = 1.6
 group 'org.iot.dsa'
 mainClassName = 'org.iot.dsa.dslink.DSLink'
 
+applicationDefaultJvmArgs = [
+        "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=" + name + ".hprof"]
+
 repositories {
     mavenLocal()
     mavenCentral()
diff --git a/dslink-java-v2-test/dslink.json b/dslink-java-v2-test/dslink.json
index 5bcda20c..56c5ff13 100644
--- a/dslink-java-v2-test/dslink.json
+++ b/dslink-java-v2-test/dslink.json
@@ -1,80 +1,23 @@
 {
   "name": "dslink-java-v2-test",
-  "version": "1.0.0.0",
+  "version": "1.0.0",
+  "dsa-version": "2.0",
   "description": "Testing Link",
-  "main": "bin/dslink-java-test",
+  "main": "bin/dslink-java-v2-test",
   "configs": {
-    "rootType": {
-      "desc1": "*************** THIS IS REQUIRED AND MUST BE CHANGED ***************",
-      "desc2": "Fully qualified class name of the root node of the link.",
+    "handler_class": {
       "type": "string",
-      "value": "org.iot.dsa.dslink.test.RootNode"
-    },
-    "broker": {
-      "desc1": "*************** OPTIONAL CONFIGS IN ALPHABETICAL ORDER ***************",
-      "desc2": "URL to broker.",
-      "type": "url",
-      "value": null
-    },
-    "connectionType": {
-      "desc": "Can be specified to override the default connection type.",
-      "type": "string",
-      "value": null
-    },
-    "isRequester": {
-      "desc": "Whether or not the link is a requester.",
-      "type": "boolean",
-      "value": false
-    },
-    "isResponder": {
-      "desc": "Whether or not the link is a responder.",
-      "type": "boolean",
-      "value": true
-    },
-    "key": {
-      "desc": "Path to public/private key pair.",
-      "type": "path",
-      "value": ".key"
+      "value": "org.iot.dsa.dslink.test.MainNode"
     },
     "log": {
-      "desc": "debug, info, warn, error, none",
+      "desc": "all, trace, debug, fine, warn, info, error, admin, fatal, none",
       "type": "enum",
       "value": "debug"
     },
-    "logFile": {
-      "desc": "Path to the log file.",
-      "type": "path",
-      "value": null
-    },
-    "nodes": {
-      "desc": "Path to configuration database.",
-      "type": "path",
-      "value": null
-    },
-    "readTimeout": {
-      "desc": "Millis timeout for reading from the connection.",
-      "type": "number",
-      "value": 60000
-    },
-    "saveInterval": {
-      "desc": "How often to backup the node database in minutes.",
-      "type": "number",
-      "value": 60
-    },
-    "stableDelay": {
-      "desc": "Millis after the node tree is started before calling stable.",
-      "type": "number",
-      "value": 5000
-    },
     "token": {
       "desc": "Authentication token for the broker.",
       "type": "string",
       "value": null
-    },
-    "transportFactory": {
-      "desc": "Can be specified to override the default standalone transport.",
-      "type": "string",
-      "value": null
     }
   }
 }
diff --git a/dslink-java-v2-test/src/main/java/org/iot/dsa/dslink/test/MainNode.java b/dslink-java-v2-test/src/main/java/org/iot/dsa/dslink/test/MainNode.java
new file mode 100644
index 00000000..e26168bc
--- /dev/null
+++ b/dslink-java-v2-test/src/main/java/org/iot/dsa/dslink/test/MainNode.java
@@ -0,0 +1,272 @@
+package org.iot.dsa.dslink.test;
+
+import org.iot.dsa.DSRuntime;
+import org.iot.dsa.dslink.DSMainNode;
+import org.iot.dsa.node.DSBool;
+import org.iot.dsa.node.DSDouble;
+import org.iot.dsa.node.DSElement;
+import org.iot.dsa.node.DSFlexEnum;
+import org.iot.dsa.node.DSInfo;
+import org.iot.dsa.node.DSInt;
+import org.iot.dsa.node.DSJavaEnum;
+import org.iot.dsa.node.DSList;
+import org.iot.dsa.node.DSLong;
+import org.iot.dsa.node.DSMap;
+import org.iot.dsa.node.DSNode;
+import org.iot.dsa.node.DSString;
+import org.iot.dsa.node.action.ActionInvocation;
+import org.iot.dsa.node.action.ActionResult;
+import org.iot.dsa.node.action.DSAction;
+import org.iot.dsa.node.action.DSActionValues;
+
+/**
+ * Link main class and node.
+ *
+ * @author Aaron Hansen
+ */
+public class MainNode extends DSMainNode implements Runnable {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Constants
+    ///////////////////////////////////////////////////////////////////////////
+
+    private static final boolean TEST_DEFAULTS = false;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private DSInfo incrementingInt = getInfo("Incrementing Int");
+    private DSInfo reset = getInfo("Reset");
+    private DSInfo test = getInfo("Test");
+    private DSInfo valuesAction = getInfo("Values Action");
+    private DSRuntime.Timer timer;
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void declareDefaults() {
+        super.declareDefaults();
+        declareDefault("Incrementing Int", DSLong.valueOf(1)).setReadOnly(true);
+        declareDefault("Writable Boolean", DSBool.valueOf(true)).setAdmin(true);
+        declareDefault("Writable Enum",
+                       DSFlexEnum.valueOf("On",
+                                          DSList.valueOf("Off", "On", "Auto", "Has Space")));
+        declareDefault("Java Enum", DSJavaEnum.valueOf(MyEnum.Off));
+        declareDefault("Message", DSString.EMPTY).setReadOnly(true);
+        DSAction action = new DSAction();
+        action.addParameter("Arg",
+                            DSJavaEnum.valueOf(MyEnum.Off),
+                            "My action description");
+        declareDefault("Reset", action);
+        declareDefault("Test", DSAction.DEFAULT);
+        action = new DSAction();
+        action.addValueResult("bool", DSBool.TRUE);
+        action.addValueResult("long", DSLong.valueOf(0));
+        declareDefault("Values Action", action);
+        //declareDefault("T./,;'<>?:\"[%]{/}bc", DSString.valueOf("abc")).setTransient(true);
+        //notice the missing chars from above, dglux gets funky with the chars: <>?:\"
+        declareDefault("T./,;'[%]{/}bc", DSString.valueOf("abc")).setTransient(true);
+        action = new DSAction();
+        action.addParameter("Arg",
+                            DSString.valueOf(""),
+                            "My action description");
+        declareDefault("Foo", action);
+    }
+
+    @Override
+    public ActionResult onInvoke(DSInfo actionInfo, ActionInvocation invocation) {
+        if (actionInfo == this.reset) {
+            put(incrementingInt, DSElement.make(0));
+            DSMap map = invocation.getParameters();
+            DSElement arg = null;
+            if (map != null) {
+                arg = invocation.getParameters().get("Arg");
+                put("Message", arg);
+            }
+            clear();
+            return null;
+        } else if (actionInfo == this.test) {
+            DSRuntime.run(new Runnable() {
+                @Override
+                public void run() {
+                    onTest();
+                }
+            });
+            return null;
+        } else if (actionInfo == this.valuesAction) {
+            return new DSActionValues(this.valuesAction.getAction())
+                    .addResult(DSBool.TRUE)
+                    .addResult(DSLong.valueOf(1234));
+        }
+        return super.onInvoke(actionInfo, invocation);
+    }
+
+    /**
+     * Start the update timer.  This only updates when something is interested in this node.
+     */
+    @Override
+    protected synchronized void onSubscribed() {
+        timer = DSRuntime.run(this, System.currentTimeMillis() + 1000l, 1000l);
+    }
+
+    /**
+     * Cancel an active timer if there is one.
+     */
+    @Override
+    protected void onStopped() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+    }
+
+    /**
+     * Action impl, build a large databases.
+     */
+    private void onTest() {
+        info("Start Test: " + new java.util.Date());
+        info("Test run (1/3) ...");
+        test(false);
+        info("Test run (2/3) ...");
+        test(false);
+        info("Test run (3/3) ...");
+        test(true);
+        info("Test Finished: " + new java.util.Date());
+    }
+
+    /**
+     * Cancel the active timer.
+     */
+    @Override
+    protected synchronized void onUnsubscribed() {
+        timer.cancel();
+        timer = null;
+    }
+
+    /**
+     * Called by an internal timer, increments an integer child on a one second interval, only when
+     * this node is subscribed.
+     */
+    @Override
+    public void run() {
+        DSElement value = incrementingInt.getValue().toElement();
+        put(incrementingInt, DSElement.make(value.toInt() + 1));
+    }
+
+    public void test(boolean print) {
+        remove("test");
+        DSNode root;
+        long startMem = testMemUsed();
+        if (print) {
+            info("Memory before: " + testFormat(startMem));
+        }
+        long time = System.currentTimeMillis();
+        root = testMakeNode();
+        put("test", root);
+        for (int i = 0; i < 10; i++) {
+            DSNode iNode = testMakeNode();
+            root.add("test" + i, iNode);
+            for (int j = 0; j < 100; j++) {
+                DSNode jNode = testMakeNode();
+                iNode.add("test" + j, jNode);
+                for (int k = 0; k < 100; k++) {
+                    jNode.add("test" + k, testMakeNode());
+                }
+            }
+        }
+        time = System.currentTimeMillis() - time;
+        long endMem = testMemUsed();
+        if (print) {
+            info("Memory after: " + testFormat(endMem));
+            info("Memory used: " + testFormat(endMem - startMem));
+            info("Create time: " + time + "ms");
+        }
+        time = System.currentTimeMillis();
+        testTraverse(root);
+        time = System.currentTimeMillis() - time;
+        endMem = testMemUsed();
+        if (print) {
+            info("Traverse time: " + time + "ms");
+            info("Memory used: " + testFormat(endMem - startMem));
+        }
+    }
+
+    private String testFormat(long mem) {
+        return (mem / 1000) + "KB";
+    }
+
+    private DSNode testMakeNode() {
+        DSNode ret;
+        if (TEST_DEFAULTS) {
+            ret = new TestNode();
+        } else {
+            ret = new DSNode();
+            ret.put("string", "abc");
+            ret.put("int", DSInt.valueOf(1000));
+            ret.put("double", DSDouble.valueOf(12345.1d));
+            ret.put("boolean", DSBool.valueOf(true));
+        }
+        return ret;
+    }
+
+    private long testMemUsed() {
+        Runtime rt = Runtime.getRuntime();
+        long mem = rt.totalMemory() - rt.freeMemory();
+        long tmp;
+        for (int i = 2; --i >= 0; ) {
+            System.gc();
+            tmp = rt.totalMemory() - rt.freeMemory();
+            if (tmp < mem) {
+                mem = tmp;
+            }
+            try {
+                Thread.sleep(1000);
+            } catch (Exception x) {
+                x.printStackTrace();
+            }
+            tmp = rt.totalMemory() - rt.freeMemory();
+            if (tmp < mem) {
+                mem = tmp;
+            }
+        }
+        return mem;
+    }
+
+
+    private void testTraverse(DSNode node) {
+        DSInfo info = node.getFirstInfo();
+        while (info != null) {
+            if (info.isNode()) {
+                testTraverse(info.getNode());
+            }
+            info = info.next();
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Inner Classes
+    ///////////////////////////////////////////////////////////////////////////
+
+    public static class TestNode extends DSNode {
+
+        public void declareDefaults() {
+            super.declareDefaults();
+            declareDefault("string", DSString.valueOf("abc"));
+            declareDefault("int", DSInt.valueOf(1000));
+            declareDefault("double", DSDouble.valueOf(12345.1d));
+            declareDefault("boolean", DSBool.valueOf(true));
+            declareDefault("action", DSAction.DEFAULT);
+        }
+
+    }
+
+    public enum MyEnum {
+        On,
+        Off,
+        Auto
+    }
+
+}
diff --git a/dslink-java-v2-test/src/main/java/org/iot/dsa/dslink/test/RootNode.java b/dslink-java-v2-test/src/main/java/org/iot/dsa/dslink/test/RootNode.java
deleted file mode 100644
index 24056be7..00000000
--- a/dslink-java-v2-test/src/main/java/org/iot/dsa/dslink/test/RootNode.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package org.iot.dsa.dslink.test;
-
-import org.iot.dsa.DSRuntime;
-import org.iot.dsa.dslink.DSRootNode;
-import org.iot.dsa.node.DSBool;
-import org.iot.dsa.node.DSElement;
-import org.iot.dsa.node.DSFlexEnum;
-import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSInt;
-import org.iot.dsa.node.DSJavaEnum;
-import org.iot.dsa.node.DSList;
-import org.iot.dsa.node.DSLong;
-import org.iot.dsa.node.DSNode;
-import org.iot.dsa.node.DSString;
-import org.iot.dsa.node.action.ActionInvocation;
-import org.iot.dsa.node.action.ActionResult;
-import org.iot.dsa.node.action.DSAction;
-
-/**
- * Link main class and root node.
- *
- * @author Aaron Hansen
- */
-public class RootNode extends DSRootNode implements Runnable {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSInfo incrementingInt = getInfo("Incrementing Int");
-    private DSInfo reset = getInfo("Reset");
-    private DSInfo test = getInfo("Test");
-    private DSRuntime.Timer timer;
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constructors
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void declareDefaults() {
-        super.declareDefaults();
-        declareDefault("Incrementing Int", DSLong.valueOf(1)).setReadOnly(true);
-        declareDefault("Writable Boolean", DSBool.valueOf(true)).setConfig(true);
-        declareDefault("Writable Enum",
-                       DSFlexEnum.valueOf("On",
-                                          DSList.valueOf("Off", "On", "Auto", "Has Space")));
-        declareDefault("Java Enum", DSJavaEnum.valueOf(MyEnum.Off));
-        declareDefault("Message", DSString.EMPTY).setReadOnly(true);
-        DSAction action = new DSAction();
-        action.addParameter("Arg",
-                            DSJavaEnum.valueOf(MyEnum.Off),
-                            "My action description");
-        declareDefault("Reset", action);
-        declareDefault("Test", new DSAction());
-    }
-
-    /**
-     * Handles the reset action.
-     *
-     * <p>
-     *
-     * {@inheritDoc}
-     */
-    @Override
-    public ActionResult onInvoke(DSInfo actionInfo, ActionInvocation invocation) {
-        if (actionInfo == this.reset) {
-            put(incrementingInt, DSInt.valueOf(0));
-            DSElement arg = invocation.getParameters().get("Arg");
-            put("Message", arg);
-            clear();
-            return null;
-        } else if (actionInfo == this.test) {
-            DSRuntime.run(new Runnable() {
-                @Override
-                public void run() {
-                    onTest();
-                }
-            });
-            return null;
-        }
-        return super.onInvoke(actionInfo, invocation);
-    }
-
-    /**
-     * Start the update timer.  This only updates when something is interested in this node.
-     */
-    @Override
-    protected synchronized void onSubscribed() {
-        timer = DSRuntime.run(this, System.currentTimeMillis() + 1000l, 1000l);
-    }
-
-    /**
-     * Cancel an active timer if there is one.
-     */
-    @Override
-    protected void onStopped() {
-        if (timer != null) {
-            timer.cancel();
-            timer = null;
-        }
-    }
-
-    /**
-     * Build a large database
-     */
-    private void onTest() {
-        /*
-        for (int i = 0; i < 1000; i++) {
-            put("test"+i, DSInt.valueOf(i));
-        }
-        */
-        /*
-        long start = System.currentTimeMillis();
-        clear();
-        long now = System.currentTimeMillis();
-        long dur = now - start;
-        info("********** Clear duration: " + dur);
-        start = System.currentTimeMillis();
-        DSNode node = new TestNode();
-        add("test", node).setConfig(true);
-        for (int i = 0; i < 10; i++) {
-            DSNode iNode = new TestNode();
-            node.add("test" + i, iNode);
-            for (int j = 0; j < 100; j++) {
-                DSNode jNode = new TestNode();
-                iNode.add("test" + j, jNode);
-                for (int k = 0; k < 100; k++) {
-                    jNode.add("test" + k, new TestNode());
-                }
-            }
-        }
-        now = System.currentTimeMillis();
-        dur = now - start;
-        info("********** Add duration: " + dur);
-        start = System.currentTimeMillis();
-        getLink().save();
-        now = System.currentTimeMillis();
-        dur = now - start;
-        info("********** Save duration: " + dur);
-        start = System.currentTimeMillis();
-        onTestIterate(node);
-        now = System.currentTimeMillis();
-        dur = now - start;
-        info("********** Iterate duration: " + dur);
-        */
-    }
-
-    /**
-     * Walk the test tree.
-     */
-    private void onTestIterate(DSNode node) {
-        for (DSInfo info : node) {
-            if (info.isNode()) {
-                onTestIterate(info.getNode());
-            }
-        }
-    }
-
-    /**
-     * Cancel the active timer.
-     */
-    @Override
-    protected synchronized void onUnsubscribed() {
-        timer.cancel();
-        timer = null;
-    }
-
-    /**
-     * Called by an internal timer, increments an integer child on a one second interval, only when
-     * this node is subscribed.
-     */
-    @Override
-    public void run() {
-        DSElement value = incrementingInt.getElement();
-        put(incrementingInt, DSElement.make(value.toInt() + 1));
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Inner Classes
-    ///////////////////////////////////////////////////////////////////////////
-
-    public static class TestNode extends DSNode {
-
-        @Override
-        protected void declareDefaults() {
-            /*
-            super.declareDefaults();
-            declareDefault("Incrementing Int", DSInt.valueOf(1)).setReadOnly(true);
-            declareDefault("Writable Boolean", DSBool.valueOf(true));
-            declareDefault("Writable Enum",
-                           DSFlexEnum.valueOf("On",
-                                              DSList.valueOf("Off", "On", "Auto", "Has Space")));
-            declareDefault("Java Enum", DSJavaEnum.valueOf(MyEnum.Off));
-            declareDefault("Message", DSString.EMPTY).setReadOnly(true);
-            DSAction action = new DSAction();
-            action.addParameter("Arg",
-                                DSJavaEnum.valueOf(MyEnum.Off),
-                                "My action description");
-            declareDefault("Reset", action);
-            */
-        }
-
-        @Override
-        protected void onStable() {
-            put("Number", DSInt.valueOf(1));
-            DSAction action = new DSAction();
-            action.addParameter("Arg1", DSString.valueOf("ID1"), null);
-            action.addParameter("Arg2", DSString.valueOf("ID2"), null);
-            action.addParameter("Arg3", DSString.valueOf("ID3"), null);
-            put("action1", action);
-            /*
-            action = new DSAction();
-            action.addParameter("Arg1", DSString.valueOf("ID1"), null);
-            action.addParameter("Arg2", DSString.valueOf("ID2"), null);
-            action.addParameter("Arg3", DSString.valueOf("ID3"), null);
-            */
-            put("action2", action);
-            /*
-            action = new DSAction();
-            action.addParameter("Arg1", DSString.valueOf("ID1"), null);
-            action.addParameter("Arg2", DSString.valueOf("ID2"), null);
-            action.addParameter("Arg3", DSString.valueOf("ID3"), null);
-            */
-            put("action3", action);
-        }
-
-    }
-
-    public enum MyEnum {
-        On,
-        Off,
-        Auto
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Initialization
-    ///////////////////////////////////////////////////////////////////////////
-
-}
diff --git a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/BinaryWsTranport.java b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/BinaryWsTranport.java
deleted file mode 100644
index 5675824f..00000000
--- a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/BinaryWsTranport.java
+++ /dev/null
@@ -1,325 +0,0 @@
-package org.iot.dsa.dslink.websocket;
-
-import com.acuity.iot.dsa.dslink.DSTransport;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.nio.ByteBuffer;
-import javax.websocket.ClientEndpoint;
-import javax.websocket.CloseReason;
-import javax.websocket.EndpointConfig;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.RemoteEndpoint;
-import javax.websocket.Session;
-import org.glassfish.tyrus.client.ClientManager;
-import org.iot.dsa.dslink.DSLinkConnection;
-import org.iot.dsa.io.DSByteBuffer;
-import org.iot.dsa.io.DSIoException;
-import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.logging.DSLogger;
-import org.iot.dsa.util.DSException;
-
-/**
- * Websocket client implementation of DSTransport based on Tyrus, the reference
- * implementation of JSR 356.
- *
- * @author Aaron Hansen
- */
-@ClientEndpoint
-public class BinaryWsTranport extends DSTransport {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static final int BUF_SIZE = 8192;
-    private static final byte[] EMPTY = new byte[0];
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    private DSByteBuffer buffer = new DSByteBuffer();
-    private ClientManager client;
-    private DSLinkConnection connection;
-    private int endMessageThreshold = 32768;
-    private int messageSize;
-    private boolean open = false;
-    private DSIReader reader;
-    private Session session;
-    private ByteBuffer writeBuffer = ByteBuffer.allocate(BUF_SIZE);
-    private DSIWriter writer;
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Constructors
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
-    @Override
-    public DSTransport beginMessage() {
-        messageSize = 0;
-        return this;
-    }
-
-    @Override
-    public DSTransport close() {
-        if (!open) {
-            return this;
-        }
-        try {
-            if (session != null) {
-                session.close();
-            }
-            session = null;
-        } catch (Exception x) {
-            finer(connection.getConnectionId(), x);
-        }
-        open = false;
-        buffer.close();
-        return this;
-    }
-
-    @Override
-    public DSTransport endMessage() {
-        write(EMPTY, 0, 0, true);
-        messageSize = 0;
-        return this;
-    }
-
-    @Override
-    public DSLinkConnection getConnection() {
-        return connection;
-    }
-
-    @Override
-    public DSIReader getReader() {
-        if (reader == null) {
-            reader = null; //TODO
-        }
-        return reader;
-    }
-
-    @Override
-    public DSIWriter getWriter() {
-        if (writer == null) {
-            writer = null; //TODO
-        }
-        return writer;
-    }
-
-    /**
-     * @return Null if not open.
-     */
-    public Session getSession() {
-        return session;
-    }
-
-    @Override
-    public boolean isOpen() {
-        return open;
-    }
-
-    @OnClose
-    public void onClose(Session session, CloseReason reason) {
-        if (open) {
-            info(getConnectionUrl() + " remotely closed, reason = " + reason.toString());
-            getConnection().onClose();
-        }
-    }
-
-    @OnError
-    public void onError(Session session, Throwable err) {
-        severe(getConnectionUrl(), err);
-        getConnection().onClose();
-    }
-
-    @OnMessage
-    public void onMessage(Session session, byte[] msgPart, boolean isLast) {
-        //isLast is ignored because we treat the incoming bytes as a pure
-        //stream.  Wish we could do the same with outbound...
-        buffer.put(msgPart, 0, msgPart.length);
-    }
-
-    @OnOpen
-    public void onOpen(Session session, EndpointConfig config) {
-        open = true;
-        this.session = session;
-    }
-
-    @Override
-    public DSTransport open() {
-        try {
-            if (open) {
-                return this;
-            }
-            if (client == null) {
-                client = ClientManager.createClient();
-            }
-            client.connectToServer(this, new URI(getConnectionUrl()));
-            buffer.open();
-            open = true;
-            fine(fine() ? "Transport open" : null);
-        } catch (Exception x) {
-            DSException.throwRuntime(x);
-        }
-        return this;
-    }
-
-    /**
-     * Returns the next incoming byte, or -1 when end of stream has been reached.
-     *
-     * @throws DSIoException if there are any issues.
-     */
-    private int read() {
-        return buffer.read();
-    }
-
-    /**
-     * Reads incoming bytes into the given buffer.
-     *
-     * @param buf The buffer into which data is read.
-     * @param off The start offset in the buffer to put data.
-     * @param len The maximum number of bytes to read.
-     * @return The number of bytes read or -1 for end of stream.
-     * @throws DSIoException if there are any issues.
-     */
-    private int read(byte[] buf, int off, int len) {
-        return buffer.read(buf, off, len);
-    }
-
-    @Override
-    public DSTransport setConnection(DSLinkConnection connection) {
-        this.connection = connection;
-        return this;
-    }
-
-    @Override
-    public DSTransport setReadTimeout(long millis) {
-        super.setReadTimeout(millis);
-        buffer.setTimeout(millis);
-        return this;
-    }
-
-    public boolean shouldEndMessage() {
-        return messageSize > endMessageThreshold;
-    }
-
-    public void write(int b) {
-        try {
-            if (!open) {
-                throw new IOException("Closed " + getConnectionUrl());
-            }
-            messageSize++;
-            RemoteEndpoint.Basic basic = session.getBasicRemote();
-            writeBuffer.put((byte) b);
-            basic.sendBinary(writeBuffer, false);
-            writeBuffer.clear();
-        } catch (IOException x) {
-            severe(getConnectionUrl(), x);
-            connection.onClose();
-        }
-    }
-
-    /**
-     * Send the buffer and indicate whether it represents the end of the message.
-     *
-     * @param buf    The bytes to send.
-     * @param idx    The index of the first byte to write.
-     * @param len    The number of bytes to send.
-     * @param isLast Whether or not this completes the message.
-     * @throws DSIoException If there are any issue.
-     */
-    public void write(byte[] buf, int idx, int len, boolean isLast) {
-        if (!open) {
-            throw new DSIoException("Closed " + getConnectionUrl());
-        }
-        try {
-            RemoteEndpoint.Basic basic = session.getBasicRemote();
-            messageSize += len;
-            while (len > BUF_SIZE) {
-                writeBuffer.put(buf, 0, BUF_SIZE);
-                basic.sendBinary(writeBuffer, false);
-                idx += BUF_SIZE;
-                len -= BUF_SIZE;
-                writeBuffer.clear();
-            }
-            if (len > 0) {
-                writeBuffer.put(buf, idx, len);
-                basic.sendBinary(writeBuffer, isLast);
-                writeBuffer.clear();
-            }
-        } catch (IOException x) {
-            severe(getConnectionUrl(), x);
-            connection.onClose();
-        }
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes
-    /////////////////////////////////////////////////////////////////
-
-    private class MyInputStream extends InputStream {
-
-        @Override
-        public int available() {
-            return buffer.available();
-        }
-
-        @Override
-        public void close() {
-            getConnection().onClose();
-        }
-
-        @Override
-        public int read() throws IOException {
-            return buffer.read();
-        }
-
-        @Override
-        public int read(byte[] buf) throws IOException {
-            return buffer.read(buf, 0, buf.length);
-        }
-
-        @Override
-        public int read(byte[] buf, int off, int len) throws IOException {
-            return buffer.read(buf, off, len);
-        }
-    }
-
-    private class MyOutputStream extends OutputStream {
-
-        @Override
-        public void close() {
-            getConnection().onClose();
-        }
-
-        @Override
-        public void write(int b) throws IOException {
-            BinaryWsTranport.this.write(b);
-        }
-
-        @Override
-        public void write(byte[] buf) throws IOException {
-            BinaryWsTranport.this.write(buf, 0, buf.length, false);
-        }
-
-        @Override
-        public void write(byte[] buf, int off, int len) throws IOException {
-            BinaryWsTranport.this.write(buf, off, len, false);
-        }
-
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
-
-}//TyrusTransportFactory
diff --git a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/StandaloneTransportFactory.java b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/StandaloneTransportFactory.java
index 2ccf7b87..3f5e8503 100644
--- a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/StandaloneTransportFactory.java
+++ b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/StandaloneTransportFactory.java
@@ -1,52 +1,27 @@
 package org.iot.dsa.dslink.websocket;
 
-import com.acuity.iot.dsa.dslink.DSTransport;
-import com.acuity.iot.dsa.dslink.DSTransport.Factory;
+import com.acuity.iot.dsa.dslink.transport.DSBinaryTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTextTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTransport.Factory;
+import org.iot.dsa.dslink.DSLinkConnection;
 import org.iot.dsa.logging.DSLogger;
-import org.iot.dsa.node.DSMap;
 
 /**
- * Websocket client implementation of DSTransport based on Tyrus, the reference
+ * Websocket client implementation of DSTransport.Factory based on Tyrus, the reference
  * implementation of JSR 356.
  *
  * @author Aaron Hansen
  */
 public class StandaloneTransportFactory extends DSLogger implements Factory {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Fields
-    ///////////////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Constructors
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - In alphabetical order by method name.
-    /////////////////////////////////////////////////////////////////
-
     @Override
-    public DSTransport makeTransport(DSMap connectionInitResponse) {
-        String wsUri = connectionInitResponse.get("wsUri", null);
-        if (wsUri == null) {
-            throw new IllegalStateException("Only websocket transports are supported.");
-        }
-        if (!"json".equals(connectionInitResponse.getString("format"))) {
-            throw new IllegalStateException("Only json is supported.");
-        }
-        return new TextWsTransport();
+    public DSBinaryTransport makeBinaryTransport(DSLinkConnection conn) {
+        return new WsBinaryTransport();
     }
 
-    /////////////////////////////////////////////////////////////////
-    // Inner Classes
-    /////////////////////////////////////////////////////////////////
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
+    @Override
+    public DSTextTransport makeTextTransport(DSLinkConnection conn) {
+        return new WsTextTransport();
+    }
 
-}//TyrusTransportFactory
+}
diff --git a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/WsBinaryTransport.java b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/WsBinaryTransport.java
new file mode 100644
index 00000000..2e332f43
--- /dev/null
+++ b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/WsBinaryTransport.java
@@ -0,0 +1,115 @@
+package org.iot.dsa.dslink.websocket;
+
+import com.acuity.iot.dsa.dslink.transport.BufferedBinaryTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import javax.websocket.ClientEndpoint;
+import javax.websocket.CloseReason;
+import javax.websocket.EndpointConfig;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.RemoteEndpoint;
+import javax.websocket.Session;
+import org.glassfish.tyrus.client.ClientManager;
+import org.iot.dsa.util.DSException;
+
+/**
+ * Websocket client implementation of DSBinaryTransport based on Tyrus, the reference implementation
+ * of JSR 356.
+ *
+ * @author Aaron Hansen
+ */
+@ClientEndpoint
+public class WsBinaryTransport extends BufferedBinaryTransport {
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Fields
+    ///////////////////////////////////////////////////////////////////////////
+
+    private ClientManager client;
+    private Session session;
+    private ByteBuffer writeBuffer;
+
+    /////////////////////////////////////////////////////////////////
+    // Methods - In alphabetical order by method name.
+    /////////////////////////////////////////////////////////////////
+
+    @Override
+    protected void doWrite(byte[] buf, int off, int len, boolean isLast) {
+        ByteBuffer byteBuffer = getByteBuffer(len);
+        try {
+            byteBuffer.put(buf, off, len);
+            byteBuffer.flip();
+            RemoteEndpoint.Basic basic = session.getBasicRemote();
+            basic.sendBinary(byteBuffer, isLast);
+            byteBuffer.clear();
+        } catch (IOException x) {
+            DSException.throwRuntime(x);
+        }
+    }
+
+    /**
+     * Called by write(), returns a bytebuffer for the given capacity ready for writing
+     * (putting).  Attempts to reuse the same buffer as much as possible.
+     */
+    private ByteBuffer getByteBuffer(int len) {
+        if (writeBuffer == null) {
+            int tmp = 16 * 1024;
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            writeBuffer = ByteBuffer.allocate(tmp);
+        } else if (writeBuffer.capacity() < len) {
+            int tmp = writeBuffer.capacity();
+            while (tmp < len) {
+                tmp += 1024;
+            }
+            writeBuffer = ByteBuffer.allocate(tmp);
+        } else {
+            writeBuffer.clear();
+        }
+        return writeBuffer;
+    }
+
+    @OnClose
+    public void onClose(Session session, CloseReason reason) {
+        info(getConnectionUrl() + " closed remotely, reason = " + reason.toString());
+        close();
+    }
+
+    @OnError
+    public void onError(Session session, Throwable err) {
+        close(err);
+    }
+
+    @OnMessage
+    public void onMessage(Session session, byte[] msgPart, boolean isLast) {
+        receive(msgPart, 0, msgPart.length);
+    }
+
+    @OnOpen
+    public void onOpen(Session session, EndpointConfig config) {
+        this.session = session;
+    }
+
+    @Override
+    public DSTransport open() {
+        try {
+            super.open();
+            if (client == null) {
+                client = ClientManager.createClient();
+            }
+            client.connectToServer(this, new URI(getConnectionUrl()));
+            fine(fine() ? "Transport open" : null);
+        } catch (Exception x) {
+            DSException.throwRuntime(x);
+        }
+        return this;
+    }
+
+
+}
diff --git a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/TextWsTransport.java b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/WsTextTransport.java
similarity index 56%
rename from dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/TextWsTransport.java
rename to dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/WsTextTransport.java
index 7d3df2b4..221dd8c6 100644
--- a/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/TextWsTransport.java
+++ b/dslink-websocket-standalone/src/main/java/org/iot/dsa/dslink/websocket/WsTextTransport.java
@@ -1,11 +1,13 @@
 package org.iot.dsa.dslink.websocket;
 
-import com.acuity.iot.dsa.dslink.DSTransport;
+import com.acuity.iot.dsa.dslink.io.DSCharBuffer;
+import com.acuity.iot.dsa.dslink.io.DSIoException;
+import com.acuity.iot.dsa.dslink.transport.DSTextTransport;
+import com.acuity.iot.dsa.dslink.transport.DSTransport;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import java.net.URI;
-import java.util.logging.Logger;
 import javax.websocket.ClientEndpoint;
 import javax.websocket.CloseReason;
 import javax.websocket.EndpointConfig;
@@ -16,31 +18,16 @@
 import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
 import org.glassfish.tyrus.client.ClientManager;
-import org.iot.dsa.dslink.DSLinkConnection;
-import org.iot.dsa.io.DSCharBuffer;
-import org.iot.dsa.io.DSIoException;
-import org.iot.dsa.io.DSIReader;
-import org.iot.dsa.io.DSIWriter;
-import org.iot.dsa.io.json.JsonAppender;
-import org.iot.dsa.io.json.JsonReader;
-import org.iot.dsa.logging.DSLogger;
-import org.iot.dsa.logging.DSLogging;
 import org.iot.dsa.util.DSException;
 
 /**
- * Websocket client implementation of DSTransport based on Tyrus, the reference
- * implementation of JSR 356.
+ * Websocket client implementation of DSTextTransport based on Tyrus, the reference implementation
+ * of JSR 356.
  *
  * @author Aaron Hansen
  */
 @ClientEndpoint
-public class TextWsTransport extends DSTransport {
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Constants
-    ///////////////////////////////////////////////////////////////////////////
-
-    private static final int BUF_SIZE = 8192;
+public class WsTextTransport extends DSTextTransport {
 
     ///////////////////////////////////////////////////////////////////////////
     // Fields
@@ -48,26 +35,23 @@ public class TextWsTransport extends DSTransport {
 
     private DSCharBuffer buffer = new DSCharBuffer();
     private ClientManager client;
-    private DSLinkConnection connection;
-    private int endMessageThreshold = 32768;
     private int messageSize;
+    private Reader myReader;
+    private Writer myWriter;
     private boolean open = false;
-    private DSIReader reader;
     private Session session;
-    private DSIWriter writer;
-
-    /////////////////////////////////////////////////////////////////
-    // Methods - Constructors
-    /////////////////////////////////////////////////////////////////
 
     /////////////////////////////////////////////////////////////////
     // Methods - In alphabetical order by method name.
     /////////////////////////////////////////////////////////////////
 
     @Override
-    public DSTransport beginMessage() {
+    public void beginRecvMessage() {
+    }
+
+    @Override
+    public void beginSendMessage() {
         messageSize = 0;
-        return this;
     }
 
     @Override
@@ -75,52 +59,41 @@ public DSTransport close() {
         if (!open) {
             return this;
         }
+        open = false;
         try {
             if (session != null) {
                 session.close();
             }
-            session = null;
         } catch (Exception x) {
-            finer(connection.getConnectionId(), x);
+            debug(getConnection().getConnectionId(), x);
         }
-        open = false;
+        session = null;
         buffer.close();
         return this;
     }
 
     @Override
-    public DSTransport endMessage() {
-        write("", true);
-        messageSize = 0;
-        return this;
+    public void endRecvMessage() {
     }
 
     @Override
-    public DSLinkConnection getConnection() {
-        return connection;
+    public void endSendMessage() {
+        write("", true);
+        messageSize = 0;
     }
 
-    @Override
-    public DSIReader getReader() {
-        if (reader == null) {
-            reader = new JsonReader(new MyReader());
+    public Reader getReader() {
+        if (myReader == null) {
+            myReader = new MyReader();
         }
-        return reader;
-    }
-
-    /**
-     * @return Null if not open.
-     */
-    public Session getSession() {
-        return session;
+        return myReader;
     }
 
-    @Override
-    public DSIWriter getWriter() {
-        if (writer == null) {
-            writer = new JsonAppender(new MyWriter()).setPrettyPrint(false);
+    public Writer getWriter() {
+        if (myWriter == null) {
+            myWriter = new MyWriter();
         }
-        return writer;
+        return myWriter;
     }
 
     @Override
@@ -128,29 +101,32 @@ public boolean isOpen() {
         return open;
     }
 
+    @Override
+    public int messageSize() {
+        return messageSize;
+    }
+
     @OnClose
     public void onClose(Session session, CloseReason reason) {
         if (open) {
             info(getConnectionUrl() + " remotely closed, reason = " + reason.toString());
-            getConnection().onClose();
+            close();
         }
     }
 
     @OnError
     public void onError(Session session, Throwable err) {
-        severe(getConnectionUrl(), err);
-        getConnection().onClose();
+        if (open) {
+            open = false;
+            error(getConnectionUrl(), err);
+            buffer.close(DSException.makeRuntime(err));
+        }
     }
 
     @OnMessage
     public void onMessage(Session session, String msgPart, boolean isLast) {
-        try {
-            finest(finest() ? "Recv: " + msgPart : null);
-            buffer.put(msgPart);
-        } catch (Exception x) {
-            getConnection().onClose();
-            DSException.throwRuntime(x);
-        }
+        trace(trace() ? "Recv: " + msgPart : null);
+        buffer.put(msgPart);
     }
 
     @OnOpen
@@ -178,45 +154,6 @@ public DSTransport open() {
         return this;
     }
 
-    /**
-     * Returns the next incoming byte, or -1 when end of stream has been reached.
-     *
-     * @throws DSIoException if there are any issues.
-     */
-    private int read() {
-        return buffer.read();
-    }
-
-    /**
-     * Reads incoming bytes into the given buffer.
-     *
-     * @param buf The buffer into which data is read.
-     * @param off The start offset in the buffer to put data.
-     * @param len The maximum number of bytes to read.
-     * @return The number of bytes read or -1 for end of stream.
-     * @throws DSIoException if there are any issues.
-     */
-    private int read(char[] buf, int off, int len) {
-        return buffer.read(buf, off, len);
-    }
-
-    @Override
-    public DSTransport setConnection(DSLinkConnection connection) {
-        this.connection = connection;
-        return this;
-    }
-
-    @Override
-    public DSTransport setReadTimeout(long millis) {
-        super.setReadTimeout(millis);
-        buffer.setTimeout(millis);
-        return this;
-    }
-
-    public boolean shouldEndMessage() {
-        return messageSize > endMessageThreshold;
-    }
-
     /**
      * Send the buffer and indicate whether it represents the end of the message.
      *
@@ -233,12 +170,14 @@ public void write(String text, boolean isLast) {
             int len = text.length();
             messageSize += len;
             if (len > 0) {
-                finest(finest() ? "Send: " + text : null);
+                trace(trace() ? "Send: " + text : null);
             }
             basic.sendText(text, isLast);
         } catch (IOException x) {
-            severe(getConnectionUrl(), x);
-            connection.onClose();
+            if (open) {
+                close();
+                DSException.throwRuntime(x);
+            }
         }
     }
 
@@ -250,7 +189,7 @@ private class MyReader extends Reader {
 
         @Override
         public void close() {
-            getConnection().onClose();
+            WsTextTransport.this.close();
         }
 
         @Override
@@ -273,13 +212,13 @@ public boolean ready() {
             return buffer.available() > 0;
         }
 
-    }
+    }//MyReader
 
     private class MyWriter extends Writer {
 
         @Override
         public void close() {
-            getConnection().onClose();
+            WsTextTransport.this.close();
         }
 
         @Override
@@ -289,7 +228,7 @@ public void flush() {
         @Override
         public void write(int b) throws IOException {
             char ch = (char) b;
-            TextWsTransport.this.write(ch + "", false);
+            WsTextTransport.this.write(ch + "", false);
         }
 
         @Override
@@ -299,18 +238,14 @@ public void write(char[] buf) throws IOException {
 
         @Override
         public void write(char[] buf, int off, int len) throws IOException {
-            TextWsTransport.this.write(new String(buf, off, len), false);
+            WsTextTransport.this.write(new String(buf, off, len), false);
         }
 
         @Override
         public void write(String str) throws IOException {
-            TextWsTransport.this.write(str, false);
+            WsTextTransport.this.write(str, false);
         }
 
-    }
-
-    /////////////////////////////////////////////////////////////////
-    // Initialization
-    /////////////////////////////////////////////////////////////////
+    }//MyWriter
 
-}//TyrusTransportFactory
+}

Modifier and Type	Method and Description
`DSLinkConnection`	`getConnection()` - The associate connection. -
`boolean`	`shouldEndMessage()` - Large outbound messages that can be broken into smaller ones should check this occasionally - when writing. -
Modifier and Type	Method and Description
`DSLink`	`getLink()` + The parent link or null. +
`protected java.lang.String`	`getLogName()` + Override point, returns the simple class name by default. +
`boolean`	`isRequester()` + Override point, returns true by default. +
`boolean`	`isResponder()` + Override point, returns true by default. +
`void`	`validateParent(DSNode node)` + The parent must be a DSLink instance. +
Modifier and Type	Method and Description
`DSLink`	`getLink()` - The parent link or null. -
`protected java.util.logging.Logger`	`getLogger(java.lang.String name)` - Creates a child logger of the link. -
`void`	`validateParent(DSNode node)` - The parent must be a DSLink instance. -
Modifier and Type	Method and Description
`protected void`	`declareDefaults()` + The is only called once for each class. +
`DSLinkConnection`	`getConnection()`
`DSLink`	`getLink()`
`protected java.lang.String`	`getLogName()` + Override point, returns the simple class name by default. +
`ActionResult`	`onInvoke(DSInfo action, + ActionInvocation invocation)` + Override point, called by the default implementation of DSAction.invoke. +
`protected void`	`validateParent(DSNode node)` + Override point, throw a meaningful IllegalArgumentException if the parent is not allowed +
Modifier and Type	Method and Description
`DSList`	`getResult(long timeout)` + Waits for the stream to close before returning, or the timeout to occur. +
`boolean`	`isAutoClose()` + True by default, whether or not to close the stream upon receiving the first result. +
`void`	`onClose()` + Causes getResult to return. +
`void`	`onColumns(DSList list)` + Does nothing. +
`void`	`onError(ErrorType type, + java.lang.String msg)` + Will create an exception to be thrown by getResult. +
`void`	`onInsert(int index, + DSList rows)` + Will result in an error since tables and streams are not supported. +
`void`	`onMode(OutboundInvokeHandler.Mode mode)` + Does nothing. +
`void`	`onReplace(int start, + int end, + DSList rows)` + Will result in an error since tables and streams are not supported. +
`void`	`onTableMeta(DSMap map)` + Called whenever metadata for the entire table is received. +
`void`	`onUpdate(DSList row)` + Captures the result and if auto-close is true, closes the stream. +
`SimpleInvokeHandler`	`setAutoClose(boolean arg)` + Whether or not to auto close the stream on the first update. +
Modifier and Type	Method and Description
`int`	`available()` - The number of bytes available for reading. -
`DSByteBuffer`	`close()` - Important for notifying waiting threads. -
`long`	`getTimeout()` - Number of millis the read methods will block before throwing an IOException. -
`boolean`	`isOpen()`
`int`	`length()`
`DSByteBuffer`	`open()`
`void`	`put(byte b)` - Add the byte to the buffer for reading. -
`void`	`put(byte[] msg)` - Add bytes to the buffer for reading. -
`void`	`put(byte[] msg, - int off, - int len)` - Add bytes to the buffer for reading. -
`void`	`put(int dest, - byte[] msg, - int off, - int len)` - Overwrite bytes in the internal buffer (which begins at index 0). -
`int`	`read()` - Returns the nextRun incoming byte, or -1 when end of stream has been reached. -
`int`	`read(byte[] buf, - int off, - int len)` - Reads incoming bytes into the given buffer. -
`DSByteBuffer`	`setTimeout(long timeout)` - Number of millis the read methods will block before throwing an DSIoException. -
`byte[]`	`toByteArray()` - Returns a new array. -
Modifier and Type	Method and Description
`int`	`available()` - The number of chars available for reading. -
`void`	`close()` - Important for notifying waiting threads. -
`long`	`getTimeout()` - Number of millis the read methods will block before throwing an IOException. -
`boolean`	`isOpen()`
`void`	`open()`
`void`	`put(char b)` - Add the char to the buffer for reading. -
`void`	`put(char[] msg)` - Add chars to the buffer for reading. -
`void`	`put(char[] msg, - int off, - int len)` - Add chars to the buffer for reading. -
`void`	`put(java.lang.String msg)` - Add chars to the buffer for reading. -
`int`	`read()` - Returns the next incoming char, or -1 when end of stream has been reached. -
`int`	`read(char[] buf, - int off, - int len)` - Reads incoming chars into the given buffer. -
`DSCharBuffer`	`setTimeout(long timeout)` - Number of millis the read methods will block before throwing an DSIoException. -
Modifier and Type	Field and Description
`static byte`	`BIN16`
`static byte`	`BIN32`
`static byte`	`BIN8`
`static byte`	`FALSE`
`static byte`	`FIXLIST_PREFIX`
`static byte`	`FIXMAP_PREFIX`
`static byte`	`FIXSTR_PREFIX`
`static byte`	`FLOAT32`
`static byte`	`FLOAT64`
`static byte`	`INT16`
`static byte`	`INT32`
`static byte`	`INT64`
`static byte`	`INT8`
`static byte`	`LIST16`
`static byte`	`LIST32`
`static byte`	`MAP16`
`static byte`	`MAP32`
`static byte`	`NULL`
`static byte`	`STR16`
`static byte`	`STR32`
`static byte`	`STR8`
`static byte`	`TRUE`
`static byte`	`UINT16`
`static byte`	`UINT32`
`static byte`	`UINT64`
`static byte`	`UINT8`
Modifier and Type	Method and Description
`void`	`close()` - Close the input. -
`static boolean`	`isFixedList(byte b)`
`static boolean`	`isFixedMap(byte b)`
`static boolean`	`isFixInt(byte b)`
`static boolean`	`isFixStr(byte b)`
`DSIReader.Token`	`next()` - Subclasses must override this, read the next item from the stream, then call one of the - setXxx methods. -
`MsgpackReader`	`reset()` - Sets last() == ROOT. -
`MsgpackReader`	`setInput(java.io.InputStream inputStream)` - Sets the input source, resets to ROOT, and returns this. -
Modifier and Type	Method and Description
`protected void`	`write(boolean arg)` - Write the value. -
`protected void`	`write(byte[] arg)` - Write the value. -
`protected void`	`write(double arg)` - Write the value. -
`protected void`	`write(long arg)` - Write the value. -
`protected void`	`writeKey(java.lang.CharSequence arg)` - Write string key of a map entry. -
`protected void`	`writeKeyValueSeparator()` - Separate the key from the value in a map. -
`protected void`	`writeListEnd()` - End the current list. -
`protected void`	`writeListStart()` - Start a new list. -
`protected void`	`writeListStart(int len)` - A negative size implies dynamic and will be written when the list is closed. -
`protected void`	`writeMapEnd()` - End the current map. -
`protected void`	`writeMapStart()` - Start a new map. -
`protected void`	`writeMapStart(int len)` - A negative size implies dynamic and will be written when the map is closed. -
`void`	`writeNewLineIndent()` - Override point for subclasses which perform use pretty printing, such as json. -
`protected void`	`writeNull()` - Write a null value. -
`protected void`	`writeSeparator()` - Write a value separator, such as the comma in json. -
`protected void`	`writeTo(java.nio.ByteBuffer out)` - Writes the internal buffer to the parameter. -
`protected void`	`writeTo(java.io.OutputStream out)` - Writes the internal buffer to the parameter. -
`protected void`	`writeValue(java.lang.CharSequence arg)` - Write the value, which will never be null. -