diff --git a/rtd_phosphonetx/dist/etc/service.properties b/rtd_phosphonetx/dist/etc/service.properties
index 3a1cbf9692c221e6568908d2389577eaae553838..2e551d8ff9d436d5859d5a42039d936dedc6adf8 100644
--- a/rtd_phosphonetx/dist/etc/service.properties
+++ b/rtd_phosphonetx/dist/etc/service.properties
@@ -4,6 +4,9 @@ data-store-server-code = DSS1
 # The root directory of the data store
 storeroot-dir = data/store
 
+# The directory where the command queue file is located; defaults to storeroot-dir 
+commandqueue-dir =
+
 # Port
 port = 8444
 
@@ -118,10 +121,9 @@ main-thread.type-extractor.locator-type = RELATIVE_LOCATION
 main-thread.type-extractor.data-set-type = PROT_RESULT
 main-thread.type-extractor.is-measured = true
 
-main-thread.dataset-handler = ch.systemsx.cisd.openbis.etlserver.phosphonetx.ResultDataSetHandler
-main-thread.dataset-handler.database.kind = demo
-main-thread.dataset-handler.database.owner = 
-main-thread.dataset-handler.database.password = 
-
 # The storage processor (IStorageProcessor implementation)
-main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+main-thread.storage-processor = ch.systemsx.cisd.openbis.etlserver.phosphonetx.StorageProcessorWithResultDataSetUploader
+main-thread.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+main-thread.storage-processor.database.kind = demo
+main-thread.storage-processor.database.owner = 
+main-thread.storage-processor.database.password = 
diff --git a/rtd_phosphonetx/etc/service.properties b/rtd_phosphonetx/etc/service.properties
index bb9148a121ef17aa55c7b6b0ceb4320f8fe31023..329e6d66589a39ed408bfaa942c2c34f8682887d 100644
--- a/rtd_phosphonetx/etc/service.properties
+++ b/rtd_phosphonetx/etc/service.properties
@@ -4,6 +4,9 @@ data-store-server-code = DSS1
 # The root directory of the data store
 storeroot-dir = targets/playground/data/store
 
+# The directory where the command queue file is located; defaults to storeroot-dir 
+commandqueue-dir =
+
 # Port
 port = 8889
 
@@ -118,10 +121,9 @@ main-thread.type-extractor.locator-type = RELATIVE_LOCATION
 main-thread.type-extractor.data-set-type = PROT_RESULT
 main-thread.type-extractor.is-measured = true
 
-main-thread.dataset-handler = ch.systemsx.cisd.openbis.etlserver.phosphonetx.ResultDataSetHandler
-main-thread.dataset-handler.database.kind = dev
-main-thread.dataset-handler.database.owner = 
-main-thread.dataset-handler.database.password = 
-
 # The storage processor (IStorageProcessor implementation)
-main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+main-thread.storage-processor = ch.systemsx.cisd.openbis.etlserver.phosphonetx.StorageProcessorWithResultDataSetUploader
+main-thread.storage-processor.processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
+main-thread.storage-processor.database.kind = dev
+main-thread.storage-processor.database.owner = 
+main-thread.storage-processor.database.password =