diff --git a/samples/FTPTester/Makefile b/samples/FTPTester/Makefile
index 7ecd94c..dc05e78 100644
--- a/samples/FTPTester/Makefile
+++ b/samples/FTPTester/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 2019, International Business Machines Corporation
 # All Rights Reserved
 
-.PHONY: all distributed standalone clean clean-runtime-generated-files clean-all run
+.PHONY: all distributed standalone clean clean-all run
 
 STREAMS_INET_TOOLKIT ?=../../com.ibm.streamsx.inet:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.inet
 ifeq ($(STREAMS_STUDIO_BUILDING), 1)
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,18 +31,15 @@ SPL_MAIN_COMPOSITE = Main
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-clean-all: clean clean-runtime-generated-files
+clean-all: clean
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
-
-clean-runtime-generated-files:
-	-rm -rf $(DATA_DIR)/*.txt
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 run: standalone
 	$(OUTPUT_DIR)/bin/standalone
diff --git a/samples/FTPTester/info.xml b/samples/FTPTester/info.xml
index ca22eba..c124a1a 100644
--- a/samples/FTPTester/info.xml
+++ b/samples/FTPTester/info.xml
@@ -8,7 +8,7 @@
      feed the content of files from a ftp-server into a IBM Streams application. It can be used for
      a quick test of an ftp server connection.
    </info:description>
-   <info:version>1.0.0</info:version>
+   <info:version>1.0.1</info:version>
    <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>
@@ -17,4 +17,4 @@
      <common:version>2.0.0</common:version>
    </info:toolkit>
  </info:dependencies>
-</info:toolkitInfoModel>
\ No newline at end of file
+</info:toolkitInfoModel>
diff --git a/samples/HTTPFunctions/Makefile b/samples/HTTPFunctions/Makefile
index aa2d110..0f17574 100644
--- a/samples/HTTPFunctions/Makefile
+++ b/samples/HTTPFunctions/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,10 +31,10 @@ SPL_MAIN_COMPOSITE = com.ibm.streamsx.inet.sample::GetPost
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
diff --git a/samples/HTTPFunctions/info.xml b/samples/HTTPFunctions/info.xml
index d4ff8bc..edea5ab 100644
--- a/samples/HTTPFunctions/info.xml
+++ b/samples/HTTPFunctions/info.xml
@@ -3,7 +3,7 @@
   <info:identity>
     <info:name>HTTPFunctions</info:name>
     <info:description>Sample application for HTTPFunctions</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/HTTPParallelRequestDemo/Makefile b/samples/HTTPParallelRequestDemo/Makefile
index 7ecd94c..dc05e78 100644
--- a/samples/HTTPParallelRequestDemo/Makefile
+++ b/samples/HTTPParallelRequestDemo/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 2019, International Business Machines Corporation
 # All Rights Reserved
 
-.PHONY: all distributed standalone clean clean-runtime-generated-files clean-all run
+.PHONY: all distributed standalone clean clean-all run
 
 STREAMS_INET_TOOLKIT ?=../../com.ibm.streamsx.inet:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.inet
 ifeq ($(STREAMS_STUDIO_BUILDING), 1)
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,18 +31,15 @@ SPL_MAIN_COMPOSITE = Main
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-clean-all: clean clean-runtime-generated-files
+clean-all: clean
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
-
-clean-runtime-generated-files:
-	-rm -rf $(DATA_DIR)/*.txt
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 run: standalone
 	$(OUTPUT_DIR)/bin/standalone
diff --git a/samples/HTTPParallelRequestDemo/info.xml b/samples/HTTPParallelRequestDemo/info.xml
index 9a9796c..4ba3ac4 100644
--- a/samples/HTTPParallelRequestDemo/info.xml
+++ b/samples/HTTPParallelRequestDemo/info.xml
@@ -7,7 +7,7 @@
      This sample demonstrates the usage of composition of HTTPParallelRequest operator of the Internet Toolkit. 
      The HTTPParallelRequest issues HTTP requests in parallel asynchronously from the input stream
    </info:description>
-   <info:version>1.0.0</info:version>
+   <info:version>1.0.1</info:version>
    <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>
diff --git a/samples/HTTPPostDemo/Makefile b/samples/HTTPPostDemo/Makefile
index b8251b2..42c5c7f 100644
--- a/samples/HTTPPostDemo/Makefile
+++ b/samples/HTTPPostDemo/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 2019, International Business Machines Corporation
 # All Rights Reserved
 
-.PHONY: all distributed standalone clean clean-runtime-generated-files clean-all run
+.PHONY: all distributed standalone clean clean-all run
 
 STREAMS_INET_TOOLKIT ?=../../com.ibm.streamsx.inet:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.inet
 ifeq ($(STREAMS_STUDIO_BUILDING), 1)
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,18 +31,15 @@ SPL_MAIN_COMPOSITE = sample::Main
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-clean-all: clean clean-runtime-generated-files
+clean-all: clean
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
-
-clean-runtime-generated-files:
-	-rm -rf $(DATA_DIR)/*.txt
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE) -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 run: standalone
 	$(OUTPUT_DIR)/bin/standalone
diff --git a/samples/HTTPPostDemo/info.xml b/samples/HTTPPostDemo/info.xml
index b44e293..171c50e 100644
--- a/samples/HTTPPostDemo/info.xml
+++ b/samples/HTTPPostDemo/info.xml
@@ -4,7 +4,7 @@
  <info:identity>
    <info:name>HTTPPostDemo</info:name>
    <info:description>Demonstrate the use of the httpPost operator</info:description>
-   <info:version>1.0.0</info:version>
+   <info:version>1.0.1</info:version>
    <info:requiredProductVersion>4.2.1.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>
@@ -13,4 +13,4 @@
      <common:version>2.1.0</common:version>
    </info:toolkit>
  </info:dependencies>
-</info:toolkitInfoModel>
\ No newline at end of file
+</info:toolkitInfoModel>
diff --git a/samples/HTTPRequestDemo/Makefile b/samples/HTTPRequestDemo/Makefile
index 4f70f8c..267f742 100644
--- a/samples/HTTPRequestDemo/Makefile
+++ b/samples/HTTPRequestDemo/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 2019, International Business Machines Corporation
 # All Rights Reserved
 
-.PHONY: all distributed standalone clean clean-runtime-generated-files clean-all run
+.PHONY: all distributed standalone clean clean-all run
 
 STREAMS_INET_TOOLKIT ?=../../com.ibm.streamsx.inet:${STREAMS_INSTALL}/toolkits/com.ibm.streamsx.inet
 ifeq ($(STREAMS_STUDIO_BUILDING), 1)
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,18 +31,15 @@ SPL_MAIN_COMPOSITE = Main
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
-clean-all: clean clean-runtime-generated-files
+clean-all: clean
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
-
-clean-runtime-generated-files:
-	-rm -rf $(DATA_DIR)/*.txt
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 run: standalone
 	$(OUTPUT_DIR)/bin/standalone
diff --git a/samples/HTTPRequestDemo/info.xml b/samples/HTTPRequestDemo/info.xml
index 1084b1e..abd86c5 100644
--- a/samples/HTTPRequestDemo/info.xml
+++ b/samples/HTTPRequestDemo/info.xml
@@ -4,7 +4,7 @@
  <info:identity>
    <info:name>HTTPRequestDemo</info:name>
    <info:description> This sample demonstrates the use of the HTTPRequest operator</info:description>
-   <info:version>1.1.0</info:version>
+   <info:version>1.1.1</info:version>
    <info:requiredProductVersion>4.2.1.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>
@@ -13,4 +13,4 @@
      <common:version>3.4.0</common:version>
    </info:toolkit>
  </info:dependencies>
-</info:toolkitInfoModel>
\ No newline at end of file
+</info:toolkitInfoModel>
diff --git a/samples/HTTPStreamRead/Makefile b/samples/HTTPStreamRead/Makefile
index 7018ebd..907e14a 100644
--- a/samples/HTTPStreamRead/Makefile
+++ b/samples/HTTPStreamRead/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,10 +31,10 @@ SPL_MAIN_COMPOSITE = com.ibm.streamsx.inet.http.sample::HTTPStreamSample
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
diff --git a/samples/HTTPStreamRead/info.xml b/samples/HTTPStreamRead/info.xml
index 0081b5c..997077f 100644
--- a/samples/HTTPStreamRead/info.xml
+++ b/samples/HTTPStreamRead/info.xml
@@ -5,7 +5,7 @@
   <info:identity>
     <info:name>HttpStreamRead</info:name>
     <info:description>Demonstrates how to use the HTTPGetStream operator</info:description>
-    <info:version>1.0.1</info:version>
+    <info:version>1.0.2</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/InetSource/Makefile b/samples/InetSource/Makefile
index feb67db..fef0d34 100644
--- a/samples/InetSource/Makefile
+++ b/samples/InetSource/Makefile
@@ -20,6 +20,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -29,10 +32,10 @@ SPL_MAIN_COMPOSITE = com.ibm.streamsx.inet.sample::GetWeather
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
diff --git a/samples/InetSource/info.xml b/samples/InetSource/info.xml
index 16035cc..7ac6f98 100644
--- a/samples/InetSource/info.xml
+++ b/samples/InetSource/info.xml
@@ -5,7 +5,7 @@
   <info:identity>
     <info:name>InetSourceSample</info:name>
     <info:description>Sample demonstrating InetSource</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/InetSourceDynamicURL/Makefile b/samples/InetSourceDynamicURL/Makefile
index 1fcf71b..3708c69 100644
--- a/samples/InetSourceDynamicURL/Makefile
+++ b/samples/InetSourceDynamicURL/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,10 +31,10 @@ SPL_MAIN_COMPOSITE = com.ibm.streamsx.inet.sample::GetWeatherDynamic
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
diff --git a/samples/InetSourceDynamicURL/info.xml b/samples/InetSourceDynamicURL/info.xml
index f87e03c..19a149d 100644
--- a/samples/InetSourceDynamicURL/info.xml
+++ b/samples/InetSourceDynamicURL/info.xml
@@ -5,7 +5,7 @@
   <info:identity>
     <info:name>InetSourceDynamicURL</info:name>
     <info:description>Sample demonstrating InetSource with dynamic URL</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/InetSourceOutputAttributes/Makefile b/samples/InetSourceOutputAttributes/Makefile
index befd956..b6e8fe9 100644
--- a/samples/InetSourceOutputAttributes/Makefile
+++ b/samples/InetSourceOutputAttributes/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
diff --git a/samples/InetSourceOutputAttributes/info.xml b/samples/InetSourceOutputAttributes/info.xml
index ca520a0..27f40b9 100644
--- a/samples/InetSourceOutputAttributes/info.xml
+++ b/samples/InetSourceOutputAttributes/info.xml
@@ -5,7 +5,7 @@
   <info:identity>
     <info:name>InetSourceOutputAttributes</info:name>
     <info:description>Sample demonstrating InetSource with explicit output attribute assignments</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/PutFile/Makefile b/samples/PutFile/Makefile
index 94db7fc..edde585 100644
--- a/samples/PutFile/Makefile
+++ b/samples/PutFile/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = $(abspath ./data)
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
diff --git a/samples/PutFile/info.xml b/samples/PutFile/info.xml
index f642ce2..2a502f3 100644
--- a/samples/PutFile/info.xml
+++ b/samples/PutFile/info.xml
@@ -3,7 +3,7 @@
   <info:identity>
     <info:name>FTP PutFile sample</info:name>
     <info:description>This sample demonstrates the use of the FTPPutFile operator</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/RemoteDirScanAndGet/Makefile b/samples/RemoteDirScanAndGet/Makefile
index 4e0b62f..4fbdca7 100644
--- a/samples/RemoteDirScanAndGet/Makefile
+++ b/samples/RemoteDirScanAndGet/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = $(abspath ./data)
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
diff --git a/samples/RemoteDirScanAndGet/info.xml b/samples/RemoteDirScanAndGet/info.xml
index 4864536..9e81e72 100644
--- a/samples/RemoteDirScanAndGet/info.xml
+++ b/samples/RemoteDirScanAndGet/info.xml
@@ -3,7 +3,7 @@
   <info:identity>
     <info:name>FTP RemoteDirScanAndGet sample</info:name>
     <info:description>Sample for remote ftp directory scan and file transfer demonstrates the use of the FTPReader operator</info:description>
-    <info:version>1.0.0</info:version>
+    <info:version>1.0.1</info:version>
     <info:requiredProductVersion>4.0.1.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies>
diff --git a/samples/SerializeAttributes/Makefile b/samples/SerializeAttributes/Makefile
index ea30f8d..283704a 100644
--- a/samples/SerializeAttributes/Makefile
+++ b/samples/SerializeAttributes/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,13 +31,13 @@ SPL_MAIN_COMPOSITE = sample::SerializeAttributes
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 run: standalone
 	$(OUTPUT_DIR)/bin/standalone
diff --git a/samples/SerializeAttributes/info.xml b/samples/SerializeAttributes/info.xml
index 417b89c..707aa90 100644
--- a/samples/SerializeAttributes/info.xml
+++ b/samples/SerializeAttributes/info.xml
@@ -4,7 +4,7 @@
  <info:identity>
    <info:name>SerializeAttributes</info:name>
    <info:description>Demonstrate the serialization and de-serialization of tuple attributes</info:description>
-   <info:version>1.0.0</info:version>
+   <info:version>1.0.1</info:version>
    <info:requiredProductVersion>4.2.1.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>
@@ -13,4 +13,4 @@
      <common:version>3.3.0</common:version>
    </info:toolkit>
  </info:dependencies>
-</info:toolkitInfoModel>
\ No newline at end of file
+</info:toolkitInfoModel>
diff --git a/samples/SerializeTuple/Makefile b/samples/SerializeTuple/Makefile
index d3bd8aa..3077804 100644
--- a/samples/SerializeTuple/Makefile
+++ b/samples/SerializeTuple/Makefile
@@ -19,6 +19,9 @@ else
     DATA_DIR = data
     OUTPUT_DIR = output
     TOOLKIT_PATH = $(STREAMS_INET_TOOLKIT)
+    ifdef STREAMS_BUILDSERVICE
+       TOOLKIT_PATH = ../toolkits:$(STREAMS_INSTALL)/toolkits
+    endif
 endif
 
 SPLC_FLAGS = -a
@@ -28,13 +31,13 @@ SPL_MAIN_COMPOSITE = sample::SerializeTuple
 all: clean distributed
 
 distributed:
-	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 standalone:
-	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -T -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 clean:
-	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --data-dir $(DATA_DIR) --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
+	$(SPLC) $(SPLC_FLAGS) -C -M $(SPL_MAIN_COMPOSITE)  -t ${TOOLKIT_PATH} --output-dir $(OUTPUT_DIR) $(SPL_CMD_ARGS)
 
 run: standalone
 	$(OUTPUT_DIR)/bin/standalone
diff --git a/samples/SerializeTuple/info.xml b/samples/SerializeTuple/info.xml
index 66a9d19..167ca3d 100644
--- a/samples/SerializeTuple/info.xml
+++ b/samples/SerializeTuple/info.xml
@@ -4,7 +4,7 @@
  <info:identity>
    <info:name>SerializeTuple</info:name>
    <info:description>Demonstrate the serialization and de-serialization of a Tuple</info:description>
-   <info:version>1.0.0</info:version>
+   <info:version>1.0.1</info:version>
    <info:requiredProductVersion>4.2.1.0</info:requiredProductVersion>
  </info:identity>
  <info:dependencies>
@@ -13,4 +13,4 @@
      <common:version>3.3.0</common:version>
    </info:toolkit>
  </info:dependencies>
-</info:toolkitInfoModel>
\ No newline at end of file
+</info:toolkitInfoModel>