diff --git a/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot b/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot
index ea541af..3c0e864 100644
--- a/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot
+++ b/local/elasticsearch-hdfs/src/main/resources/ElasticsearchHdfs.dot
@@ -4,10 +4,10 @@
 digraph g {
 
   //providers
-  ElasticsearchPersistReader [label="ElasticsearchPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java"];
+  ElasticsearchPersistReader [label="ElasticsearchPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java"];
 
   //persisters
-  WebHdfsPersistWriter [label="WebHdfsPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java"];
+  WebHdfsPersistWriter [label="WebHdfsPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistWriter.java"];
 
   //data
   source [label="es://{indexes}/{types}",shape=box];
diff --git a/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot b/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot
index 831c856..e654312 100644
--- a/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot
+++ b/local/elasticsearch-hdfs/src/main/resources/HdfsElasticsearch.dot
@@ -4,7 +4,7 @@
 digraph g {
 
   //providers
-  WebHdfsPersistReader [label="WebHdfsPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java"];
+  WebHdfsPersistReader [label="WebHdfsPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-hdfs/src/main/java/org/apache/streams/hdfs/WebHdfsPersistReader.java"];
 
   //persisters
   ElasticsearchPersistWriter [label="ElasticsearchPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java"];
diff --git a/local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md b/local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md
index a080b2c..13e0fc3 100644
--- a/local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md
+++ b/local/elasticsearch-hdfs/src/site/markdown/ElasticsearchHdfs.md
@@ -20,6 +20,11 @@
 
 <a href="ElasticsearchHdfs.dot.svg" target="_self">ElasticsearchHdfs.dot.svg</a>
 
+Configuration:
+-----------------
+
+[ElasticsearchHdfsConfiguration.json](ElasticsearchHdfsConfiguration.json "ElasticsearchHdfsConfiguration.json" )
+
 Example Configuration:
 ----------------------
 
@@ -44,4 +49,7 @@
 Run:
 --------
 
-`docker run elasticsearch-hdfs:0.2-incubating-SNAPSHOT-PP.jar java -cp stash-migrate-0.2-incubating-SNAPSHOT.jar -Dconfig.file=http://<location_of_config_file>.json org.apache.streams.elasticsearch.example.HdfsElasticsearch`
+    java -cp dist/elasticsearch-hdfs-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/test/resources/testBackup.json org.apache.streams.elasticsearch.example.HdfsElasticsearch
+
+    docker run elasticsearch-hdfs:0.2-incubating java -cp /elasticsearch-hdfs-0.2-incubating-jar-with-dependencies.jar -Dconfig.url=http://<location_of_config_resource> org.apache.streams.elasticsearch.example.HdfsElasticsearch
+    
\ No newline at end of file
diff --git a/local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md b/local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md
index 2405aea..18bd63c 100644
--- a/local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md
+++ b/local/elasticsearch-hdfs/src/site/markdown/HdfsElasticsearch.md
@@ -20,6 +20,11 @@
 
 <a href="HdfsElasticsearch.dot.svg" target="_self">HdfsElasticsearch.dot.svg</a>
 
+Configuration:
+-----------------
+
+[HdfsElasticsearchConfiguration.json](HdfsElasticsearchConfiguration.json "HdfsElasticsearchConfiguration.json" )
+
 Example Configuration:
 ----------------------
 
@@ -47,4 +52,6 @@
 Run:
 --------
 
-`docker run elasticsearch-hdfs:0.2-incubating-SNAPSHOT.jar java -cp elasticsearch-hdfs-0.2-incubating-SNAPSHOT.jar -Dconfig.file=file://<location_of_config_file>.json org.apache.streams.elasticsearch.example.HdfsElasticsearch`
+    java -cp dist/elasticsearch-hdfs-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/test/resources/testRestore.json org.apache.streams.elasticsearch.example.HdfsElasticsearch
+
+    docker run elasticsearch-hdfs:0.2-incubating java -cp /elasticsearch-hdfs-0.2-incubating-jar-with-dependencies.jar -Dconfig.url=http://<location_of_config_resource> org.apache.streams.elasticsearch.example.HdfsElasticsearch
diff --git a/local/elasticsearch-hdfs/src/site/markdown/index.md b/local/elasticsearch-hdfs/src/site/markdown/index.md
index cfd5a30..8dba931 100644
--- a/local/elasticsearch-hdfs/src/site/markdown/index.md
+++ b/local/elasticsearch-hdfs/src/site/markdown/index.md
@@ -23,7 +23,7 @@
 Build:
 ---------
 
-`mvn clean package`
+    mvn clean package verify
 
 Note that an alternative version of hdfs is packaged, by excluding org.apache.hadoop.hadoop-hdfs when
 importing org.apache.streams.streams-persist-hdfs, and specifically depending on a different preferred version.
@@ -31,5 +31,5 @@
 Deploy:
 --------
 
-`mvn -Pdocker clean package docker:build`
+    mvn -Pdocker clean package docker:build
 
diff --git a/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot b/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot
index 22644a4..857c1c1 100644
--- a/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot
+++ b/local/elasticsearch-reindex/src/main/resources/ElasticsearchReindex.dot
@@ -4,7 +4,7 @@
 digraph g {
 
   //providers
-  ElasticsearchPersistReader [label="ElasticsearchPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java"];
+  ElasticsearchPersistReader [label="ElasticsearchPersistReader",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistReader.java"];
 
   //persisters
   ElasticsearchPersistWriter [label="ElasticsearchPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java"];
diff --git a/local/elasticsearch-reindex/src/site/markdown/index.md b/local/elasticsearch-reindex/src/site/markdown/index.md
index 453dea5..00e414f 100644
--- a/local/elasticsearch-reindex/src/site/markdown/index.md
+++ b/local/elasticsearch-reindex/src/site/markdown/index.md
@@ -25,6 +25,11 @@
 
 <a href="ElasticsearchReindex.dot.svg" target="_self">ElasticsearchReindex.dot.svg</a>
 
+Configuration:
+-----------------
+
+[ElasticsearchReindexConfiguration.json](ElasticsearchReindexConfiguration.json "ElasticsearchReindexConfiguration.json" )
+
 Example Configuration:
 ----------------------
 
@@ -60,20 +65,17 @@
 Build:
 ---------
 
-`mvn clean package verify`
+    mvn clean package verify
+
+Deploy:
+--------
+
+    mvn -Pdocker clean package docker:build
 
 Run:
 --------
 
-`java -cp target/elasticsearch-reindex-0.1-SNAPSHOT.jar -Dconfig.file=src/main/resources/application.json org.apache.streams.example.elasticsearch.ElasticsearchReindex`
-
-Deploy:
---------
-`mvn -Pdocker clean package docker:build`
-
-`docker tag elasticsearch-reindex:0.2-incubating-SNAPSHOT <dockerregistry>:elasticsearch-reindex:0.2-incubating-SNAPSHOT`
-
-`docker push <dockerregistry>:elasticsearch-reindex:0.2-incubating-SNAPSHOT`
-
-`docker run <dockerregistry>:elasticsearch-reindex:0.2-incubating-SNAPSHOT.jar java -cp elasticsearch-reindex-0.2-incubating-SNAPSHOT.jar -Dconfig.file=http://<location_of_config_file>.json org.apache.streams.example.elasticsearch.ElasticsearchReindex`
+    java -cp dist/elasticsearch-reindex-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/main/resources/application.json org.apache.streams.example.elasticsearch.ElasticsearchReindex
+    
+    docker run elasticsearch-reindex:0.2-incubating java -cp /elasticsearch-reindex-0.2-incubating-jar-with-dependencies.jar -Dconfig.url=http://<location_of_config_resource> org.apache.streams.example.elasticsearch.ElasticsearchReindex
 
diff --git a/local/mongo-elasticsearch-sync/src/site/markdown/index.md b/local/mongo-elasticsearch-sync/src/site/markdown/index.md
index cce6d80..6b20968 100644
--- a/local/mongo-elasticsearch-sync/src/site/markdown/index.md
+++ b/local/mongo-elasticsearch-sync/src/site/markdown/index.md
@@ -24,6 +24,11 @@
 
 <a href="MongoElasticsearchSync.dot.svg" target="_self">MongoElasticsearchSync.dot.svg</a>
 
+Configuration:
+-----------------
+
+[MongoElasticsearchSyncConfiguration.json](MongoElasticsearchSyncConfiguration.json "MongoElasticsearchSyncConfiguration.json" )
+
 Example Configuration:
 ----------------------
 
@@ -50,19 +55,15 @@
 
 `mvn clean package verify`
 
-Run:
---------
-
-`java -cp target/mongo-elasticsearch-sync-0.1-SNAPSHOT.jar -Dconfig.file=src/main/resources/application.json org.apache.streams.example.elasticsearch.MongoElasticsearchSync`
-
 Deploy:
 --------
 
-`mvn -Pdocker clean package docker:build`
+    mvn -Pdocker clean package docker:build
 
-`docker tag mongo-elasticsearch-sync:0.2-incubating-SNAPSHOT <dockerregistry>:mongo-elasticsearch-sync:0.2-incubating-SNAPSHOT`
+Run:
+--------
 
-`docker push <dockerregistry>:mongo-elasticsearch-sync:0.2-incubating-SNAPSHOT`
+    java -cp dist/mongo-elasticsearch-sync-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/test/resources/testSync.json org.apache.streams.example.elasticsearch.MongoElasticsearchSync
 
-`docker run <dockerregistry>:mongo-elasticsearch-sync:0.2-incubating-SNAPSHOT java -cp mongo-elasticsearch-sync-0.2-incubating-SNAPSHOT.jar -Dconfig.file=http://<location_of_config_file>.json org.apache.streams.example.elasticsearch.MongoElasticsearchSync`
+    docker run mongo-elasticsearch-sync:0.2-incubating java -cp /mongo-elasticsearch-sync-0.2-incubating-jar-with-dependencies.jar -Dconfig.url=http://<location_of_config_resource> org.apache.streams.example.elasticsearch.MongoElasticsearchSync
 
diff --git a/local/twitter-follow-graph/src/main/resources/TwitterFollowGraph.dot b/local/twitter-follow-graph/src/main/resources/TwitterFollowGraph.dot
index ac51772..55f010c 100644
--- a/local/twitter-follow-graph/src/main/resources/TwitterFollowGraph.dot
+++ b/local/twitter-follow-graph/src/main/resources/TwitterFollowGraph.dot
@@ -7,8 +7,8 @@
   TwitterFollowingProvider [label="TwitterFollowingProvider",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterFollowingProvider.java"];
 
   //processors
-  TypeConverterProcessor [label="TypeConverterProcessor",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-converters/src/main/java/org/apache/streams/converters/TypeConverterProcessor.java"];
-  ActivityConverterProcessor [label="ActivityConverterProcessor",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-converters/src/main/java/org/apache/streams/converters/ActivityConverterProcessor.java"];
+  TypeConverterProcessor [label="TypeConverterProcessor",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-converters/src/main/java/org/apache/streams/converter/TypeConverterProcessor.java"];
+  ActivityConverterProcessor [label="ActivityConverterProcessor",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java"];
 
   //persisters
   GraphPersistWriter [label="GraphPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphPersistWriter.java"];
@@ -17,8 +17,8 @@
   destination [label="http://{host}:{port}/db/data",shape=box];
 
   //stream
-  TwitterFollowingProvider -> TypeConverterProcessor [label="Follow",URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/Follow.java"];
+  TwitterFollowingProvider -> TypeConverterProcessor [label="Follow",URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/Follow.json"];
   TypeConverterProcessor -> ActivityConverterProcessor [label="String"];
-  ActivityConverterProcessor -> GraphPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
+  ActivityConverterProcessor -> GraphPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
   GraphPersistWriter -> destination
 }
\ No newline at end of file
diff --git a/local/twitter-follow-graph/src/site/markdown/index.md b/local/twitter-follow-graph/src/site/markdown/index.md
index e4a865d..f3102ca 100644
--- a/local/twitter-follow-graph/src/site/markdown/index.md
+++ b/local/twitter-follow-graph/src/site/markdown/index.md
@@ -24,6 +24,11 @@
 
 <a href="TwitterFollowGraph.dot.svg" target="_self">TwitterFollowGraph.dot.svg</a>
 
+Configuration:
+-----------------
+
+[TwitterFollowGraphConfiguration.json](TwitterFollowGraphConfiguration.json "TwitterFollowGraphConfiguration.json" )
+
 Example Configuration:
 ----------------------
 
@@ -78,20 +83,18 @@
 Build:
 ---------
 
-`mvn clean package verify`
+    mvn clean package verify
+
+Deploy:
+--------
+
+    mvn -Pdocker clean package docker:build
 
 Run:
 --------
 
-`java -cp target/twitter-follow-graph-0.2-incubating-SNAPSHOT.jar -Dconfig.file=src/main/resources/application.json org.apache.streams.example.graph.TwitterFollowGraph`
+    java -cp dist/twitter-follow-graph-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/main/resources/application.json org.apache.streams.example.graph.TwitterFollowGraph
 
-Deploy:
---------
-`mvn -Pdocker clean package docker:build`
+    docker run twitter-follow-graph:0.2-incubating java -cp twitter-follow-graph-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/main/resources/application.json org.apache.streams.example.graph.TwitterFollowGraph
 
-`docker tag twitter-follow-graph:0.2-incubating-SNAPSHOT <dockerregistry>:twitter-follow-graph:0.2-incubating-SNAPSHOT`
-
-`docker push <dockerregistry>:twitter-follow-graph:0.2-incubating-SNAPSHOT`
-
-`docker run <dockerregistry>:twitter-follow-graph:0.2-incubating-SNAPSHOT java -cp twitter-follow-graph-0.2-incubating-SNAPSHOT.jar -Dconfig.file=http://<location_of_config_file>.json org.apache.streams.example.graph.TwitterFollowGraph`
 
diff --git a/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot b/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
index 6a0d4aa..d904a38 100644
--- a/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
+++ b/local/twitter-history-elasticsearch/src/main/resources/TwitterHistoryElasticsearch.dot
@@ -17,8 +17,8 @@
   
   //stream
   TwitterTimelineProvider -> ActivityConverterProcessor [label="ObjectNode"];
-  ActivityConverterProcessor -> ElasticsearchPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
+  ActivityConverterProcessor -> ElasticsearchPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
   
-  ElasticsearchPersistWriter -> es [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
+  ElasticsearchPersistWriter -> es [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
   
 }
\ No newline at end of file
diff --git a/local/twitter-history-elasticsearch/src/site/markdown/index.md b/local/twitter-history-elasticsearch/src/site/markdown/index.md
index 089daa8..0956f90 100644
--- a/local/twitter-history-elasticsearch/src/site/markdown/index.md
+++ b/local/twitter-history-elasticsearch/src/site/markdown/index.md
@@ -26,6 +26,11 @@
 
 <a href="TwitterHistoryElasticsearch.dot.svg" target="_self">TwitterHistoryElasticsearch.dot.svg</a>
 
+Configuration:
+-----------------
+
+[TwitterHistoryElasticsearchConfiguration.json](TwitterHistoryElasticsearchConfiguration.json "TwitterHistoryElasticsearchConfiguration.json" )
+
 Example Configuration:
 ----------------------
 
@@ -62,17 +67,14 @@
 
 `mvn clean package verify`
 
+Deploy:
+--------
+
+    mvn -Pdocker clean package docker:build
+
 Run:
 --------
 
-    java -cp target/twitter-history-elasticsearch-0.2-incubating-SNAPSHOT.jar -Dconfig.file=application.conf org.apache.streams.example.twitter.TwitterHistoryElasticsearch
+    java -cp dist/twitter-history-elasticsearch-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/main/resources/application.conf org.apache.streams.example.twitter.TwitterHistoryElasticsearch
 
-Deploy:
---------
-`mvn -Pdocker clean package docker:build`
-
-`docker tag twitter-history-elasticsearch:0.2-incubating-SNAPSHOT <dockerregistry>:elasticsearch-reindex:0.2-incubating-SNAPSHOT`
-
-`docker push <dockerregistry>:twitter-history-elasticsearch:0.2-incubating-SNAPSHOT`
-
-`docker run <dockerregistry>:twitter-history-elasticsearch:0.2-incubating-SNAPSHOT.jar java -cp twitter-history-elasticsearch-0.2-incubating-SNAPSHOT.jar -Dconfig.file=http://<location_of_config_file>.json org.apache.streams.example.twitter.TwitterHistoryElasticsearch`
+    docker run twitter-history-elasticsearch:0.2-incubating java -cp /twitter-history-elasticsearch-0.2-incubating-jar-with-dependencies.jar -Dconfig.url=http://<location_of_config_resource> org.apache.streams.example.twitter.TwitterHistoryElasticsearch
diff --git a/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot b/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot
index 5b43b14..72116e0 100644
--- a/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot
+++ b/local/twitter-userstream-elasticsearch/src/main/resources/TwitterUserstreamElasticsearch.dot
@@ -10,7 +10,7 @@
   ActivityConverterProcessor [label="ActivityConverterProcessor",shape=box,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterProcessor.java"];
   DeleteOnlyProcessor [label="VerbDefinitionKeepFilter (verb:delete)",shape=box,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionKeepFilter.java"];
   NoDeletesProcessor  [label="VerbDefinitionDropFilter (verb:delete)",shape=box,URL="https://github.com/apache/incubator-streams/blob/master/streams-components/streams-filters/src/main/java/org/apache/streams/filters/VerbDefinitionDropFilter.java"];
-  SetDeleteIdProcessor [label="SetDeleteIdProcessor (verb:post)",shape=box,URL="https://github.com/apache/incubator-streams-examples/blob/master/local/twitter-userstream-elasticsearch/src/main/java/org/apache/streams/twitter/example/TwitterUserstreamElasticsearch.java"];
+  SetDeleteIdProcessor [label="SetDeleteIdProcessor (verb:post)",shape=box,URL="https://github.com/apache/incubator-streams-examples/blob/master/local/twitter-userstream-elasticsearch/src/main/java/org/apache/streams/twitter/example/TwitterUserstreamElasticsearch.java#L115-128"];
 
   //persisters
   ElasticsearchPersistWriter [label="ElasticsearchPersistWriter",shape=ellipse,URL="https://github.com/apache/incubator-streams/blob/master/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java"];
@@ -21,11 +21,11 @@
 
   //stream
   TwitterStreamProvider -> ActivityConverterProcessor [label="ObjectNode"];
-  ActivityConverterProcessor -> DeleteOnlyProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
-  ActivityConverterProcessor -> NoDeletesProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
-  DeleteOnlyProcessor -> SetDeleteIdProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
-  NoDeletesProcessor -> ElasticsearchPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
-  ElasticsearchPersistWriter -> es [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/activity.json"];
-  SetDeleteIdProcessor -> ElasticsearchPersistDeleter [label="Delete",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/verbs/delete.json"];
-  ElasticsearchPersistDeleter -> es [label="Delete",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/delete.json"];
+  ActivityConverterProcessor -> DeleteOnlyProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
+  ActivityConverterProcessor -> NoDeletesProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
+  DeleteOnlyProcessor -> SetDeleteIdProcessor [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
+  NoDeletesProcessor -> ElasticsearchPersistWriter [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
+  ElasticsearchPersistWriter -> es [label="Activity",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/activity.json"];
+  SetDeleteIdProcessor -> ElasticsearchPersistDeleter [label="Delete",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/verbs/delete.json"];
+  ElasticsearchPersistDeleter -> es [label="Delete",URL="https://github.com/apache/incubator-streams/blob/master/streams-pojo/src/main/jsonschema/src/main/jsonschema/verbs/delete.json"];
 }
\ No newline at end of file
diff --git a/local/twitter-userstream-elasticsearch/src/site/markdown/index.md b/local/twitter-userstream-elasticsearch/src/site/markdown/index.md
index c87a8ae..4967265 100644
--- a/local/twitter-userstream-elasticsearch/src/site/markdown/index.md
+++ b/local/twitter-userstream-elasticsearch/src/site/markdown/index.md
@@ -24,6 +24,12 @@
 
 <a href="TwitterUserstreamElasticsearch.dot.svg" target="_self">TwitterUserstreamElasticsearch.dot.svg</a>
 
+Configuration:
+-----------------
+
+[TwitterUserstreamElasticsearchConfiguration.json](TwitterUserstreamElasticsearchConfiguration.json "TwitterUserstreamElasticsearchConfiguration.json" )
+
+
 Example Configuration:
 ----------------------
 
@@ -60,17 +66,14 @@
 
 `mvn clean package verify`
 
+Deploy:
+--------
+
+    mvn -Pdocker clean package docker:build`
+
 Run:
 --------
 
-`java -cp target/twitter-userstream-elasticsearch-0.2-incubating-SNAPSHOT.jar -Dconfig.file=src/main/resources/application.json org.apache.streams.example.twitter.TwitterUserstreamElasticsearch`
+    java -cp dist/twitter-userstream-elasticsearch-0.2-incubating-jar-with-dependencies.jar -Dconfig.file=`pwd`/src/main/resources/application.json org.apache.streams.example.twitter.TwitterUserstreamElasticsearch`
 
-Deploy:
---------
-`mvn -Pdocker clean package docker:build`
-
-`docker tag twitter-userstream-elasticsearch:0.2-incubating-SNAPSHOT <dockerregistry>:twitter-userstream-elasticsearch:0.2-incubating-SNAPSHOT`
-
-`docker push <dockerregistry>:twitter-userstream-elasticsearch:0.2-incubating-SNAPSHOT`
-
-`docker run <dockerregistry>:twitter-userstream-elasticsearch:0.2-incubating-SNAPSHOT.jar java -cp twitter-userstream-elasticsearch-0.2-incubating-SNAPSHOT.jar -Dconfig.file=http://<location_of_config_file>.json org.apache.streams.example.twitter.TwitterUserstreamElasticsearch`
+    docker run twitter-userstream-elasticsearch:0.2-incubating java -cp /twitter-userstream-elasticsearch-0.2-incubating-jar-with-dependencies.jar -Dconfig.url=http://<location_of_config_resource> org.apache.streams.example.twitter.TwitterUserstreamElasticsearch`