diff --git a/build.xml b/build.xml
index f312db9..4ef34d2 100644
--- a/build.xml
+++ b/build.xml
@@ -116,6 +116,7 @@
 			<arg value="${tktitle}" />
 			<arg value="--directory" />
 			<arg value="${tkdir}" />
+			<arg value="--copy-image-files" />
 		</exec>
 	</target>
 
diff --git a/com.ibm.streamsx.messaging/.classpath b/com.ibm.streamsx.messaging/.classpath
index 516d6ef..540b7d2 100644
--- a/com.ibm.streamsx.messaging/.classpath
+++ b/com.ibm.streamsx.messaging/.classpath
@@ -15,11 +15,11 @@
 	<classpathentry kind="lib" path="opt/downloaded/snappy-java-1.0.5.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/zkclient-0.3.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/zookeeper-3.3.4.jar"/>
-	<classpathentry kind="lib" path="opt/downloaded/mqtt-client-0.4.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/activemq-client-5.11-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/geronimo-j2ee-management_1.1_spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/geronimo-jms_1.1_spec-1.1.1.jar"/>
 	<classpathentry kind="lib" path="opt/downloaded/slf4j-api-1.7.5.jar"/>
 	<classpathentry kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
+	<classpathentry kind="lib" path="opt/downloaded/org.eclipse.paho.client.mqttv3-1.0.1-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="impl/java/bin"/>
 </classpath>
diff --git a/com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch b/com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch
deleted file mode 100644
index 9c18354..0000000
--- a/com.ibm.streamsx.messaging/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="com.ibm.etools.systems.launch.RemoteBuildConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.m2e.core.maven2Builder"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
\ No newline at end of file
diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml
index 34abc1a..7c5df30 100644
--- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml
+++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.jms/JMSSource/JMSSource.xml
@@ -53,7 +53,7 @@ The following example shows the use of multiple `JMSSource` operators with diffe
 
 	composite Main {
 	graph
-	// JMSSource operator with the default ../etc/connections.xml(relative to the data directory)
+	// JMSSource operator with the default etc/connections.xml(relative to the application directory)
 	// connections document
 	stream &lt;int32 id, rstring fname, rstring lname&gt;
 	MyPersonNamesStream  = JMSSource()
@@ -220,7 +220,7 @@ This mandatory parameter identifies the name of the connection specification tha
 	  <parameter>
 	  <name>connectionDocument</name>
         <description>
-This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If this parameter is not specified, the operator uses the file that is in the default location `../etc/connections.xml`.</description>
+This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If this parameter is not specified, the operator uses the file that is in the default location `./etc/connections.xml`.</description>
         <optional>true</optional>
         <type>rstring</type>
         <cardinality>1</cardinality>
diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm
index bfcc848..899e0ef 100644
--- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm
+++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/Common/Edge.pm
@@ -34,7 +34,7 @@ sub connectionSetup {
     my $connDocName;
     my $connDocParam = $model->getParameterByName('connectionDocument');
     if (defined $connDocParam) {
-        my $quotedConnDoc = $connDocParam->getValueAt(0)->getSPLExpression();
+        my $quotedConnDoc = SPL::CodeGen::compileTimeExpression($model, $connDocParam->getValueAt(0)); 
         @splitted = split(/"/, $quotedConnDoc);
         if (@splitted != 2) {       
             SPL::CodeGen::exitln("Value of parameter \'connectionDocument\' has unexpected format: $quotedConnDoc");
diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml
index 5cdad0f..0e05b6b 100644
--- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml
+++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSink/XMSSink.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--  
 Copyright (C)2014, International Business Machines Corporation and  
 others. All Rights Reserved. 
@@ -51,7 +51,7 @@ The following example demonstrates the use of multiple `XMSSink` operators with
 
 	composite Main{
 	graph
-	stream &lt;int32 id, rstring fname, rstring lname&gt;
+	stream &lt;int32 id, rstring fname, rstring lname>
 	MyPersonNamesStream=Beacon()
 	{
 		param
@@ -62,8 +62,8 @@ The following example demonstrates the use of multiple `XMSSink` operators with
 	() as MySink1=XMSSink(MyPersonNamesStream)
 	{
 		param
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 	}
 	
 	//XMSSink Operator with the fully qualified 
@@ -71,28 +71,28 @@ The following example demonstrates the use of multiple `XMSSink` operators with
 	() as MySink2=XMSSink(MyPersonNamesStream)
 	{
 		param
-			connectionDocument:"/home/streamsuser/connections/XMSconnections.xml";
-			connection: "wbe";
-			access: "OutTrading";
+			connectionDocument:&quot;/home/streamsuser/connections/XMSconnections.xml&quot;;
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 	}
 	
 	//XMSSink Operator with optional 
 	//output error port specified
 	stream &lt;tuple&lt;int32 id, rstring fname, 
-	rstring lname&gt;inTuple, rstring errorMessage&gt;
+	rstring lname>inTuple, rstring errorMessage>
 	MySink3 = XMSSink(MyPersonNamesStream)
 	{
 		param
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 	}
 	//XMSSink Operator with reconnectionPolicy 
 	//specified as NoRetry
 	() as  MySink4 = XMSSink( MyPersonNamesStream ) 
 	{
 		param
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 			reconnectionPolicy: NoRetry;
 	}
 	
@@ -101,8 +101,8 @@ The following example demonstrates the use of multiple `XMSSink` operators with
 	() as MySink5 = XMSSink( MyPersonNamesStream )
 	{
 		param
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 			reconnectionPolicy: InfiniteRetry;
 			period: 1.20;
 	}
@@ -111,8 +111,8 @@ The following example demonstrates the use of multiple `XMSSink` operators with
 	() as MySink6 = XMSSink( MyPersonNamesStream )
 	{
 		param
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 			reconnectionPolicy: BoundedRetry;
 			reconnectionBound: 2u;
 			period: 1.20;
@@ -121,31 +121,31 @@ The following example demonstrates the use of multiple `XMSSink` operators with
 
 The following is a sample `connections.xml` file:
 
-	&lt;st:connections xmlns:st="http://www.ibm.com/xmlns/prod/streams/adapters"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
-	&lt;connection_specifications&gt;
-		&lt;connection_specification name="wbe"&gt;
-			&lt;XMS initial_context="file:///opt/InitialContext/" 
-			connection_factory="TestConFac"  /&gt;
-		&lt;/connection_specification&gt;
-	&lt;/connection_specifications&gt;
+	&lt;st:connections xmlns:st=&quot;http://www.ibm.com/xmlns/prod/streams/adapters&quot;
+	xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;>
+	&lt;connection_specifications>
+		&lt;connection_specification name=&quot;wbe&quot;>
+			&lt;XMS initial_context=&quot;file:///opt/InitialContext/&quot; 
+			connection_factory=&quot;TestConFac&quot;  />
+		&lt;/connection_specification>
+	&lt;/connection_specifications>
 	
-	&lt;access_specifications&gt;
-		&lt;access_specification name="OutTrading"&gt;
-  			&lt;destination identifier="TestDestination" 
-			delivery_mode="persistent" message_class="map" /&gt;
-  			&lt;uses_connection connection="wbe"/&gt;
-			&lt;native_schema&gt;
-				&lt;attribute name="id" type="Int"/&gt;
-				&lt;attribute name="fname" type="String"/&gt;
-				&lt;attribute name="lname" type="String"/&gt;
-			&lt;/native_schema&gt;
-		&lt;/access_specification&gt;
-	&lt;/access_specifications&gt;
-	&lt;/st:connections&gt;	
+	&lt;access_specifications>
+		&lt;access_specification name=&quot;OutTrading&quot;>
+  			&lt;destination identifier=&quot;TestDestination&quot; 
+			delivery_mode=&quot;persistent&quot; message_class=&quot;map&quot; />
+  			&lt;uses_connection connection=&quot;wbe&quot;/>
+			&lt;native_schema>
+				&lt;attribute name=&quot;id&quot; type=&quot;Int&quot;/>
+				&lt;attribute name=&quot;fname&quot; type=&quot;String&quot;/>
+				&lt;attribute name=&quot;lname&quot; type=&quot;String&quot;/>
+			&lt;/native_schema>
+		&lt;/access_specification>
+	&lt;/access_specifications>
+	&lt;/st:connections>	
 </description>
-	<iconUri size="16">XMSSink_16.gif</iconUri>
-	<iconUri size="32">XMSSink_32.gif</iconUri>
+      <iconUri size="16">XMSSink_16.gif</iconUri>
+      <iconUri size="32">XMSSink_32.gif</iconUri>
       <metrics>
         <metric>
           <name>nTruncatedInserts</name>
@@ -213,6 +213,7 @@ The following is a sample `connections.xml` file:
         }</template>
         </codeTemplate>
       </codeTemplates>
+      <splExpressionTree param="true"/>
     </context>
     <parameters>
       <allowAny>false</allowAny>
@@ -270,7 +271,7 @@ This mandatory parameter identifies the access specification name.</description>
       <parameter>
         <name>connectionDocument</name>
         <description>
-This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If the parameter is specified, it must have exactly one value that is a string constant.  If the parameter is not specified, the operator uses the file that is in the default location `../etc/connections.xml`.		
+This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If the parameter is specified, it must have exactly one value that is a string constant.  If the parameter is not specified, the operator uses the file that is in the default location `../etc/connections.xml`.  If a relative path is specified, the path is relative to the root of the applicaiton directory.		
 </description>
         <optional>true</optional>
         <rewriteAllowed>false</rewriteAllowed>
diff --git a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSource/XMSSource.xml b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSource/XMSSource.xml
index 7e9e891..b94ba1f 100644
--- a/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSource/XMSSource.xml
+++ b/com.ibm.streamsx.messaging/com.ibm.streamsx.messaging.xms/XMSSource/XMSSource.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--  
 Copyright (C)2014, International Business Machines Corporation and  
 others. All Rights Reserved. 
@@ -60,60 +60,60 @@ The following example demonstrates the use of multiple `XMSSource` operators wit
 	graph
 	//XMSSource Operator with connections.xml 
 	//defaulted to ./etc/connections.xml
-	stream &lt;int32 id, rstring fname, rstring lname&gt;
+	stream &lt;int32 id, rstring fname, rstring lname>
 	MyPersonNamesStream  = XMSSource(){
 		param 
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 	}    
 	
 	//XMSSource operator with fully 
 	//qualified name of connections.xml
-	stream &lt;int32 id, rstring fname, rstring lname&gt;
+	stream &lt;int32 id, rstring fname, rstring lname>
 	MyPersonNamesStream = XMSSource(){
 		param     
-			connectionDocument:"/home/streamsuser/connections/XMSconnections.xml";
-			connection: "wbe";  
-			access: "OutTrading";
+			connectionDocument:&quot;/home/streamsuser/connections/XMSconnections.xml&quot;;
+			connection: &quot;wbe&quot;;  
+			access: &quot;OutTrading&quot;;
 	}    
 	
 	//XMSSource Operator with the optional 
 	//error output port specified 
-	(stream &lt;int32 id, rstring fname, rstring lname&gt;; 
-	stream &lt;rstring errorMessage&gt; ErrorStream)  = XMSSource(){
+	(stream &lt;int32 id, rstring fname, rstring lname>; 
+	stream &lt;rstring errorMessage> ErrorStream)  = XMSSource(){
 		param                     
-			connection: "wbe";
-			access: "OutTrading";
+			connection: &quot;wbe&quot;;
+			access: &quot;OutTrading&quot;;
 	}    
 	
 	//XMSSource operator with the optional 
 	//initDelay and reconnectionPolicy specified
-	stream &lt;int32 id, rstring fname, rstring lname&gt;
+	stream &lt;int32 id, rstring fname, rstring lname>
 	MyPersonNamesStream = XMSSource(){
 		param     
-			connection: "wbe"; 
-			access: "OutTrading";
+			connection: &quot;wbe&quot;; 
+			access: &quot;OutTrading&quot;;
 			reconnectionPolicy: NoRetry;
 			initDelay: 10.0;
 	}
 	
 	//XMSSource operator with the optional period 
 	//and reconnectionPolicy specified
-	stream &lt;int32 id, rstring fname, rstring lname&gt; 
+	stream &lt;int32 id, rstring fname, rstring lname> 
 	MyPersonNamesStream = XMSSource(){
 		param     
-			connection: "wbe"; 
-			access: "OutTrading"; 
+			connection: &quot;wbe&quot;; 
+			access: &quot;OutTrading&quot;; 
 			reconnectionPolicy: InfiniteRetry;
 			period: 1.20;
 	}
 	// XMSSource operator with the reconnectionPolicy
 	//specified as BoundedRetry
-	stream &lt;int32 id, rstring fname, rstring lname&gt;
+	stream &lt;int32 id, rstring fname, rstring lname>
 	MyPersonNamesStream = XMSSource(){
 		param     
-			connection: "wbe"; 
-			access: "OutTrading"; 
+			connection: &quot;wbe&quot;; 
+			access: &quot;OutTrading&quot;; 
 			reconnectionPolicy: BoundedRetry;
 			reconnectionBound: 2u;
 			period: 1.20;
@@ -122,7 +122,7 @@ The following example demonstrates the use of multiple `XMSSource` operators wit
 
 This example uses the same `connections.xml` that is provided in the example for the `XMSSink` operator.
 </description>
-	<iconUri size="16">XMSSource_16.gif</iconUri>
+      <iconUri size="16">XMSSource_16.gif</iconUri>
       <iconUri size="32">XMSSource_32.gif</iconUri>
       <metrics>
         <metric>
@@ -140,9 +140,9 @@ This example uses the same `connections.xml` that is provided in the example for
           <description>The number of connection attempts that are made before a successful connection.</description>
           <kind>Counter</kind>
         </metric>
-      </metrics> 
+      </metrics>
       <customLiterals>
-	 <enumeration>
+        <enumeration>
           <name>ReconnectionPolicy</name>
           <value>InfiniteRetry</value>
           <value>NoRetry</value>
@@ -184,15 +184,17 @@ This example uses the same `connections.xml` that is provided in the example for
       <codeTemplates>
         <codeTemplate name="XMSSource">
           <description>Basic XMSSource template</description>
-          <template>stream&lt;${streamType}&gt; ${streamName} = XMSSource()   {
+          <template>stream&lt;${streamType}> ${streamName} = XMSSource()   {
 	      param
             	connection : &quot;${ConnectionSpecificationName}&quot;;
                 access : &quot;${AccessSpecificationName}&quot;;
           }</template>
         </codeTemplate>
       </codeTemplates>
+      <splExpressionTree param="true"/>
     </context>
     <parameters>
+      <description/>
       <allowAny>false</allowAny>
       <parameter>
         <name>reconnectionPolicy</name>
@@ -237,7 +239,7 @@ This optional parameter specifies the number of seconds that the `XMSSource` ope
       </parameter>
       <parameter>
         <name>connection</name>
-       <description>
+        <description>
 This mandatory parameter identifies the name of the connection specification that contains an XMS element.</description>
         <optional>false</optional>
         <rewriteAllowed>false</rewriteAllowed>
@@ -258,7 +260,7 @@ This mandatory parameter identifies the access specification name.</description>
       <parameter>
         <name>connectionDocument</name>
         <description>
-This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If the parameter is specified, it must have exactly one value that is a string constant.  If the parameter is not specified, the operator uses the file that is in the default location `../etc/connections.xml`.</description>
+This optional parameter specifies the path name of the file that contains the connection and access specifications, which are identified by the **connection** and **access** parameters. If the parameter is specified, it must have exactly one value that is a string constant.  If the parameter is not specified, the operator uses the file that is in the default location `../etc/connections.xml`.  If a relative path is specified, the path is relative to the root of the application directory.</description>
         <optional>true</optional>
         <rewriteAllowed>false</rewriteAllowed>
         <expressionMode>AttributeFree</expressionMode>
@@ -280,7 +282,7 @@ If only the mandatory output port is specified, the operator submits a tuple for
         <windowPunctuationOutputMode>Free</windowPunctuationOutputMode>
         <windowPunctuationInputPort>-1</windowPunctuationInputPort>
         <tupleMutationAllowed>true</tupleMutationAllowed>
-	 <cardinality>1</cardinality>
+        <cardinality>1</cardinality>
         <optional>false</optional>
       </outputPortSet>
       <outputPortSet>
@@ -302,4 +304,4 @@ The optional output port is mutating and its punctuation mode is Free. Only one
       </outputPortSet>
     </outputPorts>
   </cppOperatorModel>
-</operatorModel>
+</operatorModel>
\ No newline at end of file
diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java
index 3e37736..9412513 100644
--- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java
+++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSink.java
@@ -5,6 +5,7 @@
 
 package com.ibm.streamsx.messaging.jms;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.logging.Logger;
@@ -114,7 +115,7 @@ public void setnReconnectionAttempts(Metric nReconnectionAttempts) {
 	// If present, it must have exactly one value that is a String constant.
 	// If the parameter is absent, the operator will use the default location
 	// filepath ../etc/connections.xml (with respect to the data directory)
-	private String connectionDocument = "../etc/connections.xml";
+	private String connectionDocument = null;
 	// This optional parameter reconnectionBound specifies the number of
 	// successive connections that
 	// will be attempted for this operator.
@@ -184,10 +185,25 @@ public void setPeriod(double period) {
 	}
 
 	// Optional parameter connectionDocument
-	@Parameter(optional = true)
+	@Parameter(optional = true, description="Connection document containing connection information to connect to messaging servers.  If not specified, the connection document is assumed to be application_dir/etc/connections.xml.")
 	public void setConnectionDocument(String connectionDocument) {
 		this.connectionDocument = connectionDocument;
 	}
+	
+	public String getConnectionDocument() {
+		
+		if (connectionDocument == null)
+		{
+			connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + "/etc/connections.xml";
+		}
+		
+		if (!connectionDocument.startsWith("/"))
+		{
+			connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + File.separator + connectionDocument;
+		}
+		
+		return connectionDocument;
+	}
 
 	// Add the context checks
 
@@ -320,7 +336,7 @@ public synchronized void initialize(OperatorContext context)
 		ConnectionDocumentParser connectionDocumentParser = new ConnectionDocumentParser();
 
 		connectionDocumentParser.parseAndValidateConnectionDocument(
-				connectionDocument, connection, access, streamSchema, true);
+				getConnectionDocument(), connection, access, streamSchema, true);
 
 		// codepage parameter can come only if message class is bytes
 		// Since the message class is extracted runtime during the parsing of
diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java
index f8cced2..939d461 100644
--- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java
+++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/jms/JMSSource.java
@@ -4,6 +4,7 @@
  *******************************************************************************/
 package com.ibm.streamsx.messaging.jms;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.logging.Logger;
@@ -115,8 +116,8 @@ public void setnReconnectionAttempts(Metric nReconnectionAttempts) {
 	// file containing the connection information.
 	// If present, it must have exactly one value that is a String constant.
 	// If the parameter is absent, the operator will use the default location
-	// filepath ../etc/connections.xml (with respect to the data directory)
-	private String connectionDocument = "../etc/connections.xml";
+	// filepath etc/connections.xml (with respect to the application directory)
+	private String connectionDocument = null;
 	// This optional parameter reconnectionBound specifies the number of
 	// successive connections that
 	// will be attempted for this operator.
@@ -183,10 +184,26 @@ public void setPeriod(double period) {
 	}
 
 	// Optional parameter connectionDocument
-	@Parameter(optional = true)
+	@Parameter(optional = true, description="Connection document containing connection information to connect to messaging servers.  If not specified, the connection document is assumed to be application_dir/etc/connections.xml.")
 	public void setConnectionDocument(String connectionDocument) {
 		this.connectionDocument = connectionDocument;
 	}
+	
+	public String getConnectionDocument() {
+		
+		if (connectionDocument == null)
+		{
+			connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + "/etc/connections.xml";
+		}
+		
+		// if relative path, convert to absolute path
+		if (!connectionDocument.startsWith("/"))
+		{
+			connectionDocument = getOperatorContext().getPE().getApplicationDirectory() + File.separator + connectionDocument;
+		}
+		
+		return connectionDocument;
+	}
 
 	// Add the context checks
 
@@ -306,7 +323,7 @@ public synchronized void initialize(OperatorContext context)
 		// the operator throws a runtime error and abort
 
 		connectionDocumentParser.parseAndValidateConnectionDocument(
-				connectionDocument, connection, access, streamSchema, false);
+				getConnectionDocument(), connection, access, streamSchema, false);
 
 		// codepage parameter can come only if message class is bytes
 
diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java
index b768047..1bf9b6f 100644
--- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java
+++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/kafka/KafkaBaseOper.java
@@ -2,107 +2,121 @@
  * Copyright (C) 2014, International Business Machines Corporation
  * All Rights Reserved
  *******************************************************************************/
-
-package com.ibm.streamsx.messaging.kafka;
-
-
-import java.io.FileReader;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.logging.Logger;
-
-import com.ibm.streams.operator.AbstractOperator;
-import com.ibm.streams.operator.OperatorContext;
-import com.ibm.streams.operator.StreamSchema;
-import com.ibm.streams.operator.Type.MetaType;
-import com.ibm.streams.operator.logging.TraceLevel;
-import com.ibm.streams.operator.model.Libraries;
-import com.ibm.streams.operator.model.Parameter;
-
-/**
- * Base operator for all the common functions
- *
- */
-@Libraries({"opt/downloaded/*"})
-public abstract class KafkaBaseOper extends AbstractOperator {
-	
-	protected Properties properties = new Properties(), finalProperties = new Properties();
-	protected String propertiesFile = null;
-	protected AttributeHelper topicAH = new AttributeHelper("topic"),
-							keyAH = new AttributeHelper("key"),
-							messageAH =  new AttributeHelper("message");
-	protected List<String> topics = new ArrayList<String>();
-	protected KafkaClient client= null;
-	private final Logger trace = Logger.getLogger(KafkaBaseOper.class.getCanonicalName());
-	
-	public void initialize(OperatorContext context) throws Exception {
-		super.initialize(context);
-		
-		if(propertiesFile != null) {
-			finalProperties.load(new FileReader(propertiesFile));
-		}
-		finalProperties.putAll(properties);
-		
-		if(finalProperties == null || finalProperties.isEmpty())
-			throw new Exception("Kafka connection properties must be specified.");
-		
-	}
-	
-	public void initSchema (StreamSchema ss ) throws Exception {
-		trace.log(TraceLevel.INFO, "Connection properties: " + finalProperties);
-		
-		Set<MetaType> supportedTypes =new HashSet<MetaType>();
-		supportedTypes.add(MetaType.RSTRING);
-		supportedTypes.add(MetaType.USTRING);
-		supportedTypes.add(MetaType.BLOB);
-		
-		keyAH.initialize(ss, false, supportedTypes);
-		messageAH.initialize(ss, true, supportedTypes);
-		
-		//blobs are not supported for topics
-		supportedTypes.remove(MetaType.BLOB);
-		topicAH.initialize(ss, false, supportedTypes);
-		
-		trace.log(TraceLevel.INFO, "Creating client");
-		client = new KafkaClient(topicAH, keyAH, messageAH, finalProperties);
-	}
-			
-	@Parameter(cardinality=-1, optional=true, 
-			description="Specify a Kafka property \\\"key=value\\\" form. " +
-					"This will override any property specified in the properties file.")
-	public void setKafkaProperty(List<String> values) {
-		for(String value : values) {
-			int idx = value.indexOf("=");
-			if(idx == -1) 
-				throw new IllegalArgumentException("Invalid property: " + value + ", not in the key=value format");
-			String name = value.substring(0, idx);
-			String v = value.substring(idx+1, value.length());
-			properties.setProperty(name, v);
-		}
-	}
-	
-	@Parameter(optional=true,
-			description="Properties file containing kafka properties.")
-	public void setPropertiesFile(String value) {
-		this.propertiesFile = value;
-	}	
-	
-	@Parameter(optional=true, 
-			description="Name of the attribute for the message. This attribute is required. Default is \\\"message\\\"")
-	public void setMessageAttribute(String value) {
-		messageAH.setName (value);
-	}
-	@Parameter(optional=true, description="Name of the attribute for the key. Default is \\\"key\\\"")
-	public void setKeyAttribute(String value) {
-		keyAH.setName (value);
-	}
-	
-	@Override
-	public void shutdown() {
-		client.shutdown();
-	}
-}
-
+
+package com.ibm.streamsx.messaging.kafka;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import com.ibm.streams.operator.AbstractOperator;
+import com.ibm.streams.operator.OperatorContext;
+import com.ibm.streams.operator.StreamSchema;
+import com.ibm.streams.operator.Type.MetaType;
+import com.ibm.streams.operator.logging.TraceLevel;
+import com.ibm.streams.operator.model.Libraries;
+import com.ibm.streams.operator.model.Parameter;
+
+/**
+ * Base operator for all the common functions
+ * 
+ */
+@Libraries({ "opt/downloaded/*" })
+public abstract class KafkaBaseOper extends AbstractOperator {
+
+	protected Properties properties = new Properties(),
+			finalProperties = new Properties();
+	protected String propertiesFile = null;
+	protected AttributeHelper topicAH = new AttributeHelper("topic"),
+			keyAH = new AttributeHelper("key"),
+			messageAH = new AttributeHelper("message");
+	protected List<String> topics = new ArrayList<String>();
+	protected KafkaClient client = null;
+	private final Logger trace = Logger.getLogger(KafkaBaseOper.class
+			.getCanonicalName());
+
+	public void initialize(OperatorContext context) throws Exception {
+		super.initialize(context);
+
+		String propFile = getPropertiesFile();
+		if (propFile != null) {
+			finalProperties.load(new FileReader(propFile));
+		}
+		finalProperties.putAll(properties);
+
+		if (finalProperties == null || finalProperties.isEmpty())
+			throw new Exception(
+					"Kafka connection properties must be specified.");
+
+	}
+
+	public void initSchema(StreamSchema ss) throws Exception {
+		trace.log(TraceLevel.INFO, "Connection properties: " + finalProperties);
+
+		Set<MetaType> supportedTypes = new HashSet<MetaType>();
+		supportedTypes.add(MetaType.RSTRING);
+		supportedTypes.add(MetaType.USTRING);
+		supportedTypes.add(MetaType.BLOB);
+
+		keyAH.initialize(ss, false, supportedTypes);
+		messageAH.initialize(ss, true, supportedTypes);
+
+		// blobs are not supported for topics
+		supportedTypes.remove(MetaType.BLOB);
+		topicAH.initialize(ss, false, supportedTypes);
+
+		trace.log(TraceLevel.INFO, "Creating client");
+		client = new KafkaClient(topicAH, keyAH, messageAH, finalProperties);
+	}
+
+	@Parameter(cardinality = -1, optional = true, description = "Specify a Kafka property \\\"key=value\\\" form. "
+			+ "This will override any property specified in the properties file.")
+	public void setKafkaProperty(List<String> values) {
+		for (String value : values) {
+			int idx = value.indexOf("=");
+			if (idx == -1)
+				throw new IllegalArgumentException("Invalid property: " + value
+						+ ", not in the key=value format");
+			String name = value.substring(0, idx);
+			String v = value.substring(idx + 1, value.length());
+			properties.setProperty(name, v);
+		}
+	}
+
+	@Parameter(optional = true, description = "Properties file containing kafka properties.  Properties file is recommended to be stored in the etc directory.  If a relative path is specified, the path is relative to the application directory.")
+	public void setPropertiesFile(String value) {
+		this.propertiesFile = value;
+	}
+
+	public String getPropertiesFile() {
+
+		File file = new File(propertiesFile);
+		
+		// if the properties file is relative, the path is relative to the application directory
+		if (!file.isAbsolute())
+		{
+			propertiesFile = getOperatorContext().getPE().getApplicationDirectory().getAbsolutePath() + "/" +  propertiesFile;
+		}
+		return propertiesFile;
+	}
+
+	@Parameter(optional = true, description = "Name of the attribute for the message. This attribute is required. Default is \\\"message\\\"")
+	public void setMessageAttribute(String value) {
+		messageAH.setName(value);
+	}
+
+	@Parameter(optional = true, description = "Name of the attribute for the key. Default is \\\"key\\\"")
+	public void setKeyAttribute(String value) {
+		keyAH.setName(value);
+	}
+
+	@Override
+	public void shutdown() {
+		client.shutdown();
+	}
+}
diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java
index 75b72ee..85b3ef9 100644
--- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java
+++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/AbstractMqttOperator.java
@@ -86,7 +86,7 @@ public String getConnection() {
 		return connection;
 	}
 
-	@Parameter(name = PARAMNAME_CONNECTION, description = "Name of the connection specification of the MQTT element in the connection document.", optional = true)
+	@Parameter(name = PARAMNAME_CONNECTION, description = SPLDocConstants.PARAM_CONNECTION_DESC, optional = true)
 	public void setConnection(String connection) {
 		this.connection = connection;
 	}
@@ -95,7 +95,7 @@ public String getConnectionDocument() {
 		return connectionDocument;
 	}
 
-	@Parameter(name = PARAMNAME_CONNDOC, description = "Path to connection document.  If unspecified, default to ../etc/connections.xml", optional = true)
+	@Parameter(name = PARAMNAME_CONNDOC, description = SPLDocConstants.PARAM_CONNDOC_DESC, optional = true)
 	public void setConnectionDocument(String connectionDocument) {
 		this.connectionDocument = connectionDocument;
 	}
@@ -115,18 +115,18 @@ protected void initFromConnectionDocument() throws Exception {
 			// if connection document is not specified, default to
 			// ../etc/connections.xml
 			if (connDoc == null) {
-				File dataDirectory = getOperatorContext().getPE()
-						.getDataDirectory();
-				connDoc = dataDirectory.getAbsolutePath()
-						+ "/../etc/connections.xml"; //$NON-NLS-1$
+				File appDir = getOperatorContext().getPE()
+						.getApplicationDirectory();
+				connDoc = appDir.getAbsolutePath()
+						+ "/etc/connections.xml"; //$NON-NLS-1$
 			}
 
 			// convert from relative path to absolute path is necessary
 			if (!connDoc.startsWith("/")) //$NON-NLS-1$
 			{
-				File dataDirectory = getOperatorContext().getPE()
-						.getDataDirectory();
-				connDoc = dataDirectory.getAbsolutePath() + "/" + connDoc; //$NON-NLS-1$
+				File appDir = getOperatorContext().getPE()
+						.getApplicationDirectory();
+				connDoc = appDir.getAbsolutePath() + "/" + connDoc; //$NON-NLS-1$
 			}
 
 			try {
@@ -211,7 +211,7 @@ public String getTrustStore() {
 		return toAbsolute(trustStore);
 	}
 
-	@Parameter(name = PARAMNAME_TRUST_STORE, optional = true, description = "The parameter of type rstring specifies the name of the file that contains the public certificate of the trusted MQTT server")
+	@Parameter(name = PARAMNAME_TRUST_STORE, optional = true, description = SPLDocConstants.PARAM_TRUSTORE_DESC)
 	public void setTrustStore(String trustStore) {
 		this.trustStore = trustStore;
 	}
@@ -220,7 +220,7 @@ public String getKeyStore() {
 		return toAbsolute(keyStore);
 	}
 
-	@Parameter(name = PARAMNAME_KEY_STORE, optional = true, description = "This optional parameter of type rstring specifies the file that contains the public and private key certificates of the MQTT client.")
+	@Parameter(name = PARAMNAME_KEY_STORE, optional = true, description = SPLDocConstants.PARAM_KEYSTORE_DESC)
 	public void setKeyStore(String keyStore) {
 		this.keyStore = keyStore;
 	}
@@ -229,7 +229,7 @@ public String getKeyStorePassword() {
 		return keyStorePassword;
 	}
 
-	@Parameter(name = PARAMNAME_KEY_STORE_PASSWORD, optional = true, description = "This optional parameter of type rstring specifies keystore password.")
+	@Parameter(name = PARAMNAME_KEY_STORE_PASSWORD, optional = true, description = SPLDocConstants.PARAM_KEYSTORE_PW_DESC)
 	public void setKeyStorePassword(String keyStorePassword) {
 		this.keyStorePassword = keyStorePassword;
 	}
@@ -238,7 +238,7 @@ public String getTrustStorePassword() {
 		return trustStorePassword;
 	}
 
-	@Parameter(name = PARAMNAME_TRUST_STORE_PASSWORD, optional = true, description = "This optional parameter of type rstring specifies the truststore password.")
+	@Parameter(name = PARAMNAME_TRUST_STORE_PASSWORD, optional = true, description = SPLDocConstants.PARAM_TRUSTORE_PW_DESC)
 	public void setTrustStorePassword(String trustStorePassword) {
 		this.trustStorePassword = trustStorePassword;
 	}
@@ -295,8 +295,8 @@ protected static void validateSchemaForErrorOutputPort(
 	protected String toAbsolute(String path) {
 		if (path != null && !path.startsWith("/")) //$NON-NLS-1$
 		{
-			File dataDir = getOperatorContext().getPE().getDataDirectory();
-			return dataDir.getAbsolutePath() + "/" + path; //$NON-NLS-1$
+			File appDir = getOperatorContext().getPE().getApplicationDirectory();
+			return appDir.getAbsolutePath() + "/" + path; //$NON-NLS-1$
 		}
 		return path;
 	}
diff --git a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java
index 700f2f5..340d398 100644
--- a/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java
+++ b/com.ibm.streamsx.messaging/impl/java/src/com/ibm/streamsx/messaging/mqtt/SPLDocConstants.java
@@ -42,6 +42,12 @@ public class SPLDocConstants {
 
 	public static final String MQTTSINK_INPUTPORT1 = "Optional input ports";
 
-	public static final String MQTTSINK_INPUTPORT0 = "Port that ingests tuples.";
+	public static final String MQTTSINK_INPUTPORT0 = "Port that ingests tuples.";
+	public static final String PARAM_CONNECTION_DESC = "Name of the connection specification of the MQTT element in the connection document.";
+	public static final String PARAM_CONNDOC_DESC = "Path to connection document.  If unspecified, default to applicationDir/etc/connections.xml.  If a relative path is specified, the path is relative to the application directory.";
+	public static final String PARAM_TRUSTORE_PW_DESC = "This optional parameter of type rstring specifies the truststore password.";
+	public static final String PARAM_KEYSTORE_PW_DESC = "This optional parameter of type rstring specifies keystore password.";
+	public static final String PARAM_KEYSTORE_DESC = "This optional parameter of type rstring specifies the file that contains the public and private key certificates of the MQTT client.  If a relative path is specified, the path is relative to the application directory.";
+	public static final String PARAM_TRUSTORE_DESC = "The parameter of type rstring specifies the name of the file that contains the public certificate of the trusted MQTT server.  If a relative path is specified, the path is relative to the application directory.";
 
 }
diff --git a/com.ibm.streamsx.messaging/info.xml b/com.ibm.streamsx.messaging/info.xml
index 5898b7e..ad05e30 100644
--- a/com.ibm.streamsx.messaging/info.xml
+++ b/com.ibm.streamsx.messaging/info.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (C) 2010,2012-2014, International Business Machines Corporation -->
 <!-- All Rights Reserved                                                   -->
-<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common"
- xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
- <info:identity>
-   <info:name>com.ibm.streamsx.messaging</info:name>
-   <info:description>
+<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common" xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
+  <info:identity>
+    <info:name>com.ibm.streamsx.messaging</info:name>
+    <info:description>
 The Messaging toolkit project is an open source IBM InfoSphere Streams toolkit project. It is focused on the development of operators and functions that help you use InfoSphere Streams to interact with messaging systems such as JMS, XMS, and MQTT. 
 
 The operators provide the ability for InfoSphere Streams applications to send and receive data from a queue or topic that is posted on WebSphere MQ, Apache ActiveMQ or MQ Telemetry Transport (MQTT) server.
@@ -27,13 +26,13 @@ The following figure shows how the JMSSource and JMSSink operators in the Messag
 
 The Messaging Toolkit operators must be configured to connect to messaging systems. This configuration information is specified in an XML document, called a connection specifications document. The connection specifications document is similar to but separate from the document that is used by the Database Toolkit.
 </info:description>
-<info:version>0.8.0</info:version>
-<info:requiredProductVersion>3.2.0</info:requiredProductVersion>
-</info:identity>
-<info:dependencies/>
-<info:resources>
-<info:messageSet name="MessagingResource">
-<info:lang default="true">en_US/MessagingResource.xlf</info:lang>
-</info:messageSet>
-</info:resources>
-</info:toolkitInfoModel>
+    <info:version>2.0.0</info:version>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
+  </info:identity>
+  <info:dependencies/>
+  <info:resources>
+    <info:messageSet name="MessagingResource">
+      <info:lang default="true">en_US/MessagingResource.xlf</info:lang>
+    </info:messageSet>
+  </info:resources>
+</info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/JMSSink/.classpath b/samples/JMSSink/.classpath
index 33980c4..a03f378 100644
--- a/samples/JMSSink/.classpath
+++ b/samples/JMSSink/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="impl/java/bin" path="impl/java/src"/>
 	<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="impl/java/bin"/>
diff --git a/samples/JMSSink/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSinkMain-Distributed.splbuild b/samples/JMSSink/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSinkMain-Distributed.splbuild
new file mode 100644
index 0000000..d3bdd2f
--- /dev/null
+++ b/samples/JMSSink/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSinkMain-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.jms::JMSSinkMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JMSSink/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSinkMain-Standalone.splbuild b/samples/JMSSink/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSinkMain-Standalone.splbuild
new file mode 100644
index 0000000..fc4bb74
--- /dev/null
+++ b/samples/JMSSink/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSinkMain-Standalone.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Standalone</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.jms::JMSSinkMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">T</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JMSSink/com.ibm.streamsx.messaging.sample.jms/JMSSinkMain.spl b/samples/JMSSink/com.ibm.streamsx.messaging.sample.jms/JMSSinkMain.spl
index 3ba52e5..44a1d71 100644
--- a/samples/JMSSink/com.ibm.streamsx.messaging.sample.jms/JMSSinkMain.spl
+++ b/samples/JMSSink/com.ibm.streamsx.messaging.sample.jms/JMSSinkMain.spl
@@ -10,7 +10,7 @@ use com.ibm.streamsx.messaging.jms::* ;
  *  JMSSink operator.
  * 
  *  This sample connects to a messaging server as specified in the connection 
- *  document located in ../etc/connections.xml.  The connection info, and the
+ *  document located in ./etc/connections.xml.  The connection info, and the
  *  data schema for the message is defined in the connection document.
  * 
  *  To connect to ActiveMQ:
diff --git a/samples/JMSSink/info.xml b/samples/JMSSink/info.xml
index e4b3795..7fd068c 100644
--- a/samples/JMSSink/info.xml
+++ b/samples/JMSSink/info.xml
@@ -8,12 +8,12 @@ others. All Rights Reserved.
     <info:name>JMSSinkMain</info:name>
     <info:description>Sample demonstrating JMSSink</info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.1.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/JMSSource/.classpath b/samples/JMSSource/.classpath
index 33980c4..a03f378 100644
--- a/samples/JMSSource/.classpath
+++ b/samples/JMSSource/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="impl/java/bin" path="impl/java/src"/>
 	<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="impl/java/bin"/>
diff --git a/samples/JMSSource/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSourceMain-Distributed.splbuild b/samples/JMSSource/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSourceMain-Distributed.splbuild
new file mode 100644
index 0000000..209c867
--- /dev/null
+++ b/samples/JMSSource/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSourceMain-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.jms::JMSSourceMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JMSSource/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSourceMain-Standalone.splbuild b/samples/JMSSource/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSourceMain-Standalone.splbuild
new file mode 100644
index 0000000..9177a5c
--- /dev/null
+++ b/samples/JMSSource/.settings/com.ibm.streamsx.messaging.sample.jms.JMSSourceMain-Standalone.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Standalone</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.jms::JMSSourceMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">T</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JMSSource/info.xml b/samples/JMSSource/info.xml
index 73b5b5c..70cb9a2 100644
--- a/samples/JMSSource/info.xml
+++ b/samples/JMSSource/info.xml
@@ -8,12 +8,12 @@ others. All Rights Reserved.
     <info:name>JMSSourceMain</info:name>
     <info:description>Sample demonstrating JMSSource</info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.1.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/JmsWithXmlParse/.classpath b/samples/JmsWithXmlParse/.classpath
index 33980c4..a03f378 100644
--- a/samples/JmsWithXmlParse/.classpath
+++ b/samples/JmsWithXmlParse/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="impl/java/bin" path="impl/java/src"/>
 	<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="impl/java/bin"/>
diff --git a/samples/JmsWithXmlParse/.gitignore b/samples/JmsWithXmlParse/.gitignore
new file mode 100644
index 0000000..01afdcf
--- /dev/null
+++ b/samples/JmsWithXmlParse/.gitignore
@@ -0,0 +1 @@
+/impl/
diff --git a/samples/JmsWithXmlParse/.settings/application.JmsWithXmlParse-Distributed.splbuild b/samples/JmsWithXmlParse/.settings/application.JmsWithXmlParse-Distributed.splbuild
new file mode 100644
index 0000000..04efa88
--- /dev/null
+++ b/samples/JmsWithXmlParse/.settings/application.JmsWithXmlParse-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">application::JmsWithXmlParse</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JmsWithXmlParse/.settings/application.JmsWithXmlParse-Standalone.splbuild b/samples/JmsWithXmlParse/.settings/application.JmsWithXmlParse-Standalone.splbuild
new file mode 100644
index 0000000..1e83fa4
--- /dev/null
+++ b/samples/JmsWithXmlParse/.settings/application.JmsWithXmlParse-Standalone.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Standalone</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">application::JmsWithXmlParse</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">T</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JmsWithXmlParse/Makefile b/samples/JmsWithXmlParse/Makefile
index d35250c..ba0d51f 100644
--- a/samples/JmsWithXmlParse/Makefile
+++ b/samples/JmsWithXmlParse/Makefile
@@ -1,68 +1,24 @@
-#
-# Generated by InfoSphere Streams Studio
-#
+# Copyright (C)2014, International Business Machines Corporation and  
+# others. All Rights Reserved.                        
 .PHONY: all clean
 
-#
-# Project Settings
-SPLC_TOOLKIT_COM.IBM.STREAMSX.MESSAGING_0.7.0 = ../../com.ibm.streamsx.messaging
-SPLC_TOOLKIT_PATH =  -t $(SPLC_TOOLKIT_COM.IBM.STREAMSX.MESSAGING_0.7.0)
-SPLC_OUTPUT_DIR = "output"
-SPLC_DATA_DIR = "data"
+SPLC_FLAGS = -a -z -t ../../com.ibm.streamsx.messaging
 
-#
-# Main Composite: application::JmsWithXmlParse
-SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aJMSWITHXMLPARSE = application::JmsWithXmlParse
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE = application_x3a_x3aJmsWithXmlParse
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE_CLEAN = application_x3a_x3aJmsWithXmlParse-clean
-
-#
-# Main Composite: application::JmsWithXmlParse
-# Build Configuration: Distributed
-# Active: true
-SPLC_BUILDCONFIG__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED = Distributed
-SPLC_FLAGS__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED =  --output-directory="output/application.JmsWithXmlParse/Distributed" --data-directory="data"
-SPLC_ARGS__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED = 
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED = application_x3a_x3aJmsWithXmlParse-Distributed
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED_CLEAN = application_x3a_x3aJmsWithXmlParse-Distributed-clean
-
-#
-# InfoSphere Streams
 SPLC = $(STREAMS_INSTALL)/bin/sc
-SPLC_INDEXER = $(STREAMS_INSTALL)/bin/spl-make-toolkit
-SPLC_TOOLKIT_XML = toolkit.xml
-SPLC_NO_TK = --no-toolkit-indexing
-SPLC_NO_MM = --no-mixed-mode-preprocessing
-SPLC_MODEL_ERRORS = --verbose-model-errors
-
-#
-# Targets
-#
-all: $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE) 
-
-
-clean: $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE_CLEAN) 
-
-
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE): $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED) 
-
-
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE_CLEAN): $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED_CLEAN) 
 
+SPL_CMD_ARGS ?=
+SPL_MAIN_COMPOSITE = application::JmsWithXmlParse
+OUTPUT_DIR = output
 
-#
-# Main Composite: application::JmsWithXmlParse
-# Build Configuration: Distributed
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED): $(SPLC_TOOLKIT_XML)
-	$(SPLC) $(SPLC_FLAGS__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED) -M $(SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aJMSWITHXMLPARSE) $(SPLC_TOOLKIT_PATH) $(SPLC_NO_TK) $(SPLC_NO_MM) $(SPLC_ARGS__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED)
+all: distributed
 
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED_CLEAN): $(SPLC_TOOLKIT_XML)
-	$(SPLC) $(SPLC_FLAGS__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED) -C -M $(SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aJMSWITHXMLPARSE) $(SPLC_TOOLKIT_PATH) $(SPLC_NO_TK) $(SPLC_NO_MM) $(SPLC_ARGS__APPLICATION_x3a_x3aJMSWITHXMLPARSE__DISTRIBUTED)
+standalone:
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) $(SPL_CMD_ARGS)
 
+distributed:
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) --output-dir ./$(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-#
-# Toolkit index
-$(SPLC_TOOLKIT_XML): 
-	$(SPLC_INDEXER) -i . $(SPLC_NO_MM) $(SPLC_MODEL_ERRORS)
+clean:
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)
 
 
diff --git a/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl b/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl
index 5081d7d..59ae69a 100644
--- a/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl
+++ b/samples/JmsWithXmlParse/application/JmsWithXmlParse.spl
@@ -18,7 +18,7 @@ composite JmsWithXmlParse
 {
 	param
 		expression<rstring> $connectionDoc : getSubmissionTimeValue("connectionDoc",
-			"../etc/connections.xml") ;
+			"./etc/connections.xml") ;
 		expression<rstring> $connection : getSubmissionTimeValue("connection",
 			"conn") ;
 		expression<rstring> $access : getSubmissionTimeValue("access",
diff --git a/samples/JmsWithXmlParse/info.xml b/samples/JmsWithXmlParse/info.xml
index c4e5243..f9644b8 100644
--- a/samples/JmsWithXmlParse/info.xml
+++ b/samples/JmsWithXmlParse/info.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common"
- xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
- <info:identity>
-   <info:name>JmsWithXmlParse</info:name>
-   <info:description></info:description>
-   <info:version>1.0.0</info:version>
-   <info:requiredProductVersion>3.2.1.0</info:requiredProductVersion>
- </info:identity>
- <info:dependencies>
-   <info:toolkit>
-     <common:name>com.ibm.streamsx.messaging</common:name>
-     <common:version>0.7.0</common:version>
-   </info:toolkit>
- </info:dependencies>
+<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common" xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
+  <info:identity>
+    <info:name>JmsWithXmlParse</info:name>
+    <info:description></info:description>
+    <info:version>1.0.0</info:version>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
+  </info:identity>
+  <info:dependencies>
+    <info:toolkit>
+      <common:name>com.ibm.streamsx.messaging</common:name>
+      <common:version>[0.7.0,3.0.0)</common:version>
+    </info:toolkit>
+  </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/JmsWithXmlParseBytes/.classpath b/samples/JmsWithXmlParseBytes/.classpath
index 33980c4..a03f378 100644
--- a/samples/JmsWithXmlParseBytes/.classpath
+++ b/samples/JmsWithXmlParseBytes/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="impl/java/bin" path="impl/java/src"/>
 	<classpathentry exported="true" kind="con" path="com.ibm.streams.java/com.ibm.streams.operator"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="impl/java/bin"/>
diff --git a/samples/JmsWithXmlParseBytes/.gitignore b/samples/JmsWithXmlParseBytes/.gitignore
new file mode 100644
index 0000000..01afdcf
--- /dev/null
+++ b/samples/JmsWithXmlParseBytes/.gitignore
@@ -0,0 +1 @@
+/impl/
diff --git a/samples/JmsWithXmlParseBytes/.settings/application.JmsWithXmlParseBytes-Distributed.splbuild b/samples/JmsWithXmlParseBytes/.settings/application.JmsWithXmlParseBytes-Distributed.splbuild
new file mode 100644
index 0000000..def8235
--- /dev/null
+++ b/samples/JmsWithXmlParseBytes/.settings/application.JmsWithXmlParseBytes-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">application::JmsWithXmlParseBytes</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JmsWithXmlParseBytes/.settings/application.JmsWithXmlParseBytes-Standalone.splbuild b/samples/JmsWithXmlParseBytes/.settings/application.JmsWithXmlParseBytes-Standalone.splbuild
new file mode 100644
index 0000000..23dab97
--- /dev/null
+++ b/samples/JmsWithXmlParseBytes/.settings/application.JmsWithXmlParseBytes-Standalone.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Standalone</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">application::JmsWithXmlParseBytes</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">T</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/JmsWithXmlParseBytes/Makefile b/samples/JmsWithXmlParseBytes/Makefile
index fcf410a..d66123b 100644
--- a/samples/JmsWithXmlParseBytes/Makefile
+++ b/samples/JmsWithXmlParseBytes/Makefile
@@ -1,68 +1,24 @@
-#
-# Generated by InfoSphere Streams Studio
-#
+# Copyright (C)2014, International Business Machines Corporation and  
+# others. All Rights Reserved.                        
 .PHONY: all clean
 
-#
-# Project Settings
-SPLC_TOOLKIT_COM.IBM.STREAMSX.MESSAGING_0.7.0 = ../../com.ibm.streamsx.messaging
-SPLC_TOOLKIT_PATH =  -t $(SPLC_TOOLKIT_COM.IBM.STREAMSX.MESSAGING_0.7.0)
-SPLC_OUTPUT_DIR = "output"
-SPLC_DATA_DIR = "data"
+SPLC_FLAGS = -a -z -t ../../com.ibm.streamsx.messaging
 
-#
-# Main Composite: application::JmsWithXmlParseBytes
-SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES = application::JmsWithXmlParseBytes
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES = application_x3a_x3aJmsWithXmlParseBytes
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES_CLEAN = application_x3a_x3aJmsWithXmlParseBytes-clean
-
-#
-# Main Composite: application::JmsWithXmlParseBytes
-# Build Configuration: Distributed
-# Active: true
-SPLC_BUILDCONFIG__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED = Distributed
-SPLC_FLAGS__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED =  --output-directory="output/application.JmsWithXmlParseBytes/Distributed" --data-directory="data"
-SPLC_ARGS__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED = 
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED = application_x3a_x3aJmsWithXmlParseBytes-Distributed
-SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED_CLEAN = application_x3a_x3aJmsWithXmlParseBytes-Distributed-clean
-
-#
-# InfoSphere Streams
 SPLC = $(STREAMS_INSTALL)/bin/sc
-SPLC_INDEXER = $(STREAMS_INSTALL)/bin/spl-make-toolkit
-SPLC_TOOLKIT_XML = toolkit.xml
-SPLC_NO_TK = --no-toolkit-indexing
-SPLC_NO_MM = --no-mixed-mode-preprocessing
-SPLC_MODEL_ERRORS = --verbose-model-errors
-
-#
-# Targets
-#
-all: $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES) 
-
-
-clean: $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES_CLEAN) 
-
-
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES): $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED) 
-
-
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES_CLEAN): $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED_CLEAN) 
 
+SPL_CMD_ARGS ?=
+SPL_MAIN_COMPOSITE = application::JmsWithXmlParseBytes
+OUTPUT_DIR = output
 
-#
-# Main Composite: application::JmsWithXmlParseBytes
-# Build Configuration: Distributed
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED): $(SPLC_TOOLKIT_XML)
-	$(SPLC) $(SPLC_FLAGS__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED) -M $(SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES) $(SPLC_TOOLKIT_PATH) $(SPLC_NO_TK) $(SPLC_NO_MM) $(SPLC_ARGS__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED)
+all: distributed
 
-$(SPLC_TARGET__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED_CLEAN): $(SPLC_TOOLKIT_XML)
-	$(SPLC) $(SPLC_FLAGS__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED) -C -M $(SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES) $(SPLC_TOOLKIT_PATH) $(SPLC_NO_TK) $(SPLC_NO_MM) $(SPLC_ARGS__APPLICATION_x3a_x3aJMSWITHXMLPARSEBYTES__DISTRIBUTED)
+standalone:
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) $(SPL_CMD_ARGS)
 
+distributed:
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) --output-dir ./$(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-#
-# Toolkit index
-$(SPLC_TOOLKIT_XML): 
-	$(SPLC_INDEXER) -i . $(SPLC_NO_MM) $(SPLC_MODEL_ERRORS)
+clean:
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)
 
 
diff --git a/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl b/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl
index cf2fcd8..242231c 100644
--- a/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl
+++ b/samples/JmsWithXmlParseBytes/application/JmsWithXmlParseBytes.spl
@@ -10,7 +10,7 @@ use com.ibm.streamsx.messaging.jms::*;
 composite JmsWithXmlParseBytes {
 param
 		expression<rstring> $connectionDoc : getSubmissionTimeValue("connectionDoc",
-			"../etc/connections.xml") ;
+			"./etc/connections.xml") ;
 		expression<rstring> $connection : getSubmissionTimeValue("connection",
 			"conn") ;
 		expression<rstring> $access : getSubmissionTimeValue("access",
diff --git a/samples/JmsWithXmlParseBytes/info.xml b/samples/JmsWithXmlParseBytes/info.xml
index 84d064f..1775eef 100644
--- a/samples/JmsWithXmlParseBytes/info.xml
+++ b/samples/JmsWithXmlParseBytes/info.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common"
- xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
- <info:identity>
-   <info:name>JmsWithXmlParseBytes</info:name>
-   <info:description></info:description>
-   <info:version>1.0.0</info:version>
-   <info:requiredProductVersion>3.2.1.0</info:requiredProductVersion>
- </info:identity>
- <info:dependencies>
-   <info:toolkit>
-     <common:name>com.ibm.streamsx.messaging</common:name>
-     <common:version>0.7.0</common:version>
-   </info:toolkit>
- </info:dependencies>
+<info:toolkitInfoModel xmlns:common="http://www.ibm.com/xmlns/prod/streams/spl/common" xmlns:info="http://www.ibm.com/xmlns/prod/streams/spl/toolkitInfo">
+  <info:identity>
+    <info:name>JmsWithXmlParseBytes</info:name>
+    <info:description></info:description>
+    <info:version>1.0.0</info:version>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
+  </info:identity>
+  <info:dependencies>
+    <info:toolkit>
+      <common:name>com.ibm.streamsx.messaging</common:name>
+      <common:version>[0.7.0,3.0.0)</common:version>
+    </info:toolkit>
+  </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/KafkaConsumerSample/.settings/com.ibm.streamsx.messaging.sample.kafka.KafkaConsumerSample-Distributed.splbuild b/samples/KafkaConsumerSample/.settings/com.ibm.streamsx.messaging.sample.kafka.KafkaConsumerSample-Distributed.splbuild
new file mode 100644
index 0000000..af90279
--- /dev/null
+++ b/samples/KafkaConsumerSample/.settings/com.ibm.streamsx.messaging.sample.kafka.KafkaConsumerSample-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.kafka::KafkaConsumerSample</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/KafkaConsumerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaConsumerSample.spl b/samples/KafkaConsumerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaConsumerSample.spl
index 4957176..37340d2 100644
--- a/samples/KafkaConsumerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaConsumerSample.spl
+++ b/samples/KafkaConsumerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaConsumerSample.spl
@@ -2,7 +2,7 @@
 // * Copyright (C)2014, International Business Machines Corporation and *
 // * others. All Rights Reserved. *
 // *******************************************************************************
-namespace com.ibm.streamsx.messaging.sample.kafka;
+namespace com.ibm.streamsx.messaging.sample.kafka ;
 
 use com.ibm.streamsx.messaging.kafka::KafkaConsumer ;
 
@@ -16,14 +16,16 @@ composite KafkaConsumerSample
 		stream<rstring key, rstring message> KafkaStream = KafkaConsumer()
 		{
 			param
-				propertiesFile : "consumer.properties";
-				topic : "mytopic";
+				propertiesFile : "etc/consumer.properties" ;
+				topic : "mytopic" ;
 		}
 
-		() as SinkOp = Custom(KafkaStream) {
-		logic onTuple KafkaStream : 
-			println("Message: " + (rstring)KafkaStream);
+		() as SinkOp = Custom(KafkaStream)
+		{
+			logic
+				onTuple KafkaStream : println("Message: " +(rstring) KafkaStream) ;
 		}
+
 }
 
 
diff --git a/samples/KafkaConsumerSample/data/consumer.properties b/samples/KafkaConsumerSample/etc/consumer.properties
similarity index 100%
rename from samples/KafkaConsumerSample/data/consumer.properties
rename to samples/KafkaConsumerSample/etc/consumer.properties
diff --git a/samples/KafkaConsumerSample/info.xml b/samples/KafkaConsumerSample/info.xml
index c15941b..b958253 100644
--- a/samples/KafkaConsumerSample/info.xml
+++ b/samples/KafkaConsumerSample/info.xml
@@ -4,12 +4,12 @@
     <info:name>KafkaConsumerSample</info:name>
     <info:description>Sample application showing a Streams Kafka Consumer</info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.2.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/KafkaProducerSample/.settings/com.ibm.streamsx.messaging.sample.kafka.KafkaProducerSample-Distributed.splbuild b/samples/KafkaProducerSample/.settings/com.ibm.streamsx.messaging.sample.kafka.KafkaProducerSample-Distributed.splbuild
new file mode 100644
index 0000000..69b8dc7
--- /dev/null
+++ b/samples/KafkaProducerSample/.settings/com.ibm.streamsx.messaging.sample.kafka.KafkaProducerSample-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.kafka::KafkaProducerSample</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/KafkaProducerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaProducerSample.spl b/samples/KafkaProducerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaProducerSample.spl
index 9d42ebc..fd9160f 100644
--- a/samples/KafkaProducerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaProducerSample.spl
+++ b/samples/KafkaProducerSample/com.ibm.streamsx.messaging.sample.kafka/KafkaProducerSample.spl
@@ -27,7 +27,7 @@ composite KafkaProducerSample
 
 		() as KafkaSinkOp = KafkaProducer(OutputStream) {
 			param
-				propertiesFile : "producer.properties";
+				propertiesFile : "etc/producer.properties";
 		}
 
 }
diff --git a/samples/KafkaProducerSample/data/producer.properties b/samples/KafkaProducerSample/etc/producer.properties
similarity index 100%
rename from samples/KafkaProducerSample/data/producer.properties
rename to samples/KafkaProducerSample/etc/producer.properties
diff --git a/samples/KafkaProducerSample/info.xml b/samples/KafkaProducerSample/info.xml
index 813c875..d3439a1 100644
--- a/samples/KafkaProducerSample/info.xml
+++ b/samples/KafkaProducerSample/info.xml
@@ -4,12 +4,12 @@
     <info:name>KafkaProducerSample</info:name>
     <info:description>Sample application showing a Streams Kafka Producer</info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.2.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/MqttSample/.settings/application.MqttSample-Distributed.splbuild b/samples/MqttSample/.settings/application.MqttSample-Distributed.splbuild
new file mode 100644
index 0000000..00c5474
--- /dev/null
+++ b/samples/MqttSample/.settings/application.MqttSample-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">application::MqttSample</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/MqttSample/.settings/application.MqttSample-Standalone.splbuild b/samples/MqttSample/.settings/application.MqttSample-Standalone.splbuild
new file mode 100644
index 0000000..770c7f0
--- /dev/null
+++ b/samples/MqttSample/.settings/application.MqttSample-Standalone.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Standalone</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">application::MqttSample</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">T</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/MqttSample/Makefile b/samples/MqttSample/Makefile
index e7239a4..e5ced87 100644
--- a/samples/MqttSample/Makefile
+++ b/samples/MqttSample/Makefile
@@ -1,68 +1,24 @@
-#
-# Generated by InfoSphere Streams Studio
-#
+# Copyright (C)2014, International Business Machines Corporation and  
+# others. All Rights Reserved.                        
 .PHONY: all clean
 
-#
-# Project Settings
-SPLC_TOOLKIT_COM.IBM.STREAMSX.MESSAGING = ../../com.ibm.streamsx.messaging
-SPLC_TOOLKIT_PATH =  -t $(SPLC_TOOLKIT_COM.IBM.STREAMSX.MESSAGING)
-SPLC_OUTPUT_DIR = "output"
-SPLC_DATA_DIR = "data" 
+SPLC_FLAGS = -a -z -t ../../com.ibm.streamsx.messaging
 
-#
-# Main Composite: application::MqttSample
-SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aMQTTSAMPLE = application::MqttSample
-SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE = application_x3a_x3aMqttSample
-SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE_CLEAN = application_x3a_x3aMqttSample-clean
-
-#
-# Main Composite: application::MqttSample
-# Build Configuration: Distributed
-# Active: true
-SPLC_BUILDCONFIG__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED = Distributed
-SPLC_FLAGS__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED =  --output-directory="output/application.MqttSample/Distributed" --data-directory="data"
-SPLC_ARGS__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED = 
-SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED = application_x3a_x3aMqttSample-Distributed
-SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED_CLEAN = application_x3a_x3aMqttSample-Distributed-clean
-
-#
-# InfoSphere Streams
 SPLC = $(STREAMS_INSTALL)/bin/sc
-SPLC_INDEXER = $(STREAMS_INSTALL)/bin/spl-make-toolkit
-SPLC_TOOLKIT_XML = toolkit.xml
-SPLC_NO_TK = --no-toolkit-indexing
-SPLC_NO_MM = --no-mixed-mode-preprocessing
-SPLC_MODEL_ERRORS = --verbose-model-errors
-
-#
-# Targets
-#
-all: $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE) 
-
-
-clean: $(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE_CLEAN) 
-
-
-$(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE): $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED) 
-
-
-$(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE_CLEAN): $(SPLC_TOOLKIT_XML) $(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED_CLEAN) 
 
+SPL_CMD_ARGS ?=
+SPL_MAIN_COMPOSITE = application::MqttSample
+OUTPUT_DIR = output
 
-#
-# Main Composite: application::MqttSample
-# Build Configuration: Distributed
-$(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED): $(SPLC_TOOLKIT_XML)
-	$(SPLC) $(SPLC_FLAGS__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED) -M $(SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aMQTTSAMPLE) $(SPLC_TOOLKIT_PATH) $(SPLC_NO_TK) $(SPLC_NO_MM) $(SPLC_ARGS__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED)
+all: distributed
 
-$(SPLC_TARGET__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED_CLEAN): $(SPLC_TOOLKIT_XML)
-	$(SPLC) $(SPLC_FLAGS__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED) -C -M $(SPLC_MAIN_COMPOSITE__APPLICATION_x3a_x3aMQTTSAMPLE) $(SPLC_TOOLKIT_PATH) $(SPLC_NO_TK) $(SPLC_NO_MM) $(SPLC_ARGS__APPLICATION_x3a_x3aMQTTSAMPLE__DISTRIBUTED)
+standalone:
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) $(SPL_CMD_ARGS)
 
+distributed:
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) --output-dir ./$(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-#
-# Toolkit index
-$(SPLC_TOOLKIT_XML): 
-	$(SPLC_INDEXER) -i . $(SPLC_NO_MM) $(SPLC_MODEL_ERRORS)
+clean:
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)
 
 
diff --git a/samples/MqttSample/info.xml b/samples/MqttSample/info.xml
index be3a2ae..5f4d3b6 100644
--- a/samples/MqttSample/info.xml
+++ b/samples/MqttSample/info.xml
@@ -4,12 +4,12 @@
     <info:name>MqttSample</info:name>
     <info:description></info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.2.1.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/XMSSink/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSinkMain-Distributed.splbuild b/samples/XMSSink/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSinkMain-Distributed.splbuild
new file mode 100644
index 0000000..7a4655c
--- /dev/null
+++ b/samples/XMSSink/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSinkMain-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.xms::XMSSinkMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/XMSSink/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSinkMain-Standalone.splbuild b/samples/XMSSink/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSinkMain-Standalone.splbuild
new file mode 100644
index 0000000..5beb915
--- /dev/null
+++ b/samples/XMSSink/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSinkMain-Standalone.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Standalone</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.xms::XMSSinkMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Standalone</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">T</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/XMSSink/info.xml b/samples/XMSSink/info.xml
index 76b190a..320ad5b 100644
--- a/samples/XMSSink/info.xml
+++ b/samples/XMSSink/info.xml
@@ -8,12 +8,12 @@ others. All Rights Reserved.
     <info:name>XMSSinkMain</info:name>
     <info:description>Sample demonstrating XMSSink</info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.0.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file
diff --git a/samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild b/samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild
new file mode 100644
index 0000000..06def2e
--- /dev/null
+++ b/samples/XMSSource/.settings/com.ibm.streamsx.messaging.sample.xms.XMSSourceMain-Distributed.splbuild
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+<comment>SPL Build Configuration: Distributed</comment>
+<entry key="com.ibm.streams.studio.splproject:STATIC_LINKING">F</entry>
+<entry key="com.ibm.streams.studio.splproject:OPTIMIZED_CODE">F</entry>
+<entry key="com.ibm.streams.studio.splproject:FUSION_MODE">FDEF</entry>
+<entry key="com.ibm.streams.studio.splproject:MAIN_COMPOSITE">com.ibm.streamsx.messaging.sample.xms::XMSSourceMain</entry>
+<entry key="com.ibm.streams.studio.splproject:NAME">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:GCC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:SC_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:ACTIVE">T</entry>
+<entry key="com.ibm.streams.studio.splproject:LD_OPTS"/>
+<entry key="com.ibm.streams.studio.splproject:PRE_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:DATA_DIR"/>
+<entry key="com.ibm.streams.studio.splproject:POST_BUILD_CMD"/>
+<entry key="com.ibm.streams.studio.splproject:REPLACE_ENVIRONMENT">F</entry>
+<entry key="com.ibm.streams.studio.splproject:USE_PROJECT_DATA_DIR">T</entry>
+<entry key="com.ibm.streams.studio.splproject:PROFILING"/>
+<entry key="com.ibm.streams.studio.splproject:SDB">F</entry>
+<entry key="com.ibm.streams.studio.splproject:DEFAULT_POOL_SIZE"/>
+<entry key="com.ibm.streams.studio.splproject:OUTPUT_DIR">Distributed</entry>
+<entry key="com.ibm.streams.studio.splproject:SAMPLING_RATE"/>
+<entry key="com.ibm.streams.studio.splproject:STANDALONE">F</entry>
+</properties>
\ No newline at end of file
diff --git a/samples/XMSSource/info.xml b/samples/XMSSource/info.xml
index 17df620..aa9e3e7 100644
--- a/samples/XMSSource/info.xml
+++ b/samples/XMSSource/info.xml
@@ -8,12 +8,12 @@ others. All Rights Reserved.
     <info:name>XMSSourceMain</info:name>
     <info:description>Sample demonstrating XMSSource</info:description>
     <info:version>1.0.0</info:version>
-    <info:requiredProductVersion>3.0.0</info:requiredProductVersion>
+    <info:requiredProductVersion>3.2.2</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
     <info:toolkit>
       <common:name>com.ibm.streamsx.messaging</common:name>
-      <common:version>[0.7.0,2.0.0)</common:version>
+      <common:version>[0.7.0,3.0.0)</common:version>
     </info:toolkit>
   </info:dependencies>
 </info:toolkitInfoModel>
\ No newline at end of file