diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index 1af18a44a7258d331d3659a67c992eb6b31b9fa3..d6965f7794b3c6a7616dc01c0788e6d316e4d2da 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -124,7 +124,7 @@ reporting-plugins = demo-reporter, tsv-viewer, csv-viewer, hcs-viewer, hcs-viewe
 # Label of the plugin which will be shown for the users.
 demo-reporter.label = Show Dataset Size
 # Comma separated list of dataset type codes which can be handled by this plugin.
-demo-reporter.dataset-types = HCS_IMAGE
+demo-reporter.dataset-types = HCS_IMAGE, CONTAINER_TYPE
 # Plugin class specification (together with the list of packages this class belongs to).
 demo-reporter.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo.DemoReportingPlugin
 # The property file. Its content will be passed as a parameter to the plugin.
@@ -134,6 +134,13 @@ tsv-viewer.label = TSV View
 tsv-viewer.dataset-types = TSV
 tsv-viewer.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.TSVViewReportingPlugin
 tsv-viewer.properties-file =
+# Optional properties:
+# - separator of values in the file, significant for TSV and CSV files; default: tab
+#tsv-viewer.separator = ;
+# - whether lines beginning with '#' should be ignored by the plugin; default: true
+#tsv-viewer.ignore-comments = false
+# - excel sheet name or index (0 based) used for the excel file (.xsl or .xslx); default: 0 (first sheet)
+#tsv-viewer.excel-sheet = example_sheet_name
 
 csv-viewer.label = CSV View 
 csv-viewer.dataset-types = CSV
@@ -166,7 +173,7 @@ processing-plugins = demo-processor
 
 # The configuration of the processing plugin is the same as the reporting plugins configuration. 
 demo-processor.label = Demo Processing
-demo-processor.dataset-types = HCS_IMAGE
+demo-processor.dataset-types = HCS_IMAGE, CONTAINER_TYPE
 demo-processor.class = ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo.DemoProcessingPlugin
 demo-processor.properties-file = 
 
@@ -220,7 +227,7 @@ main-thread.incoming-dir = ${root-dir}/incoming
 #  - auto-detection - when no write access will be detected for a specified 'quite-period'
 #  - marker-file		- when an appropriate marker file for the data exists. 
 # The default value is 'marker-file'.
-main-thread.incoming-data-completeness-condition = marker-file
+main-thread.incoming-data-completeness-condition = auto-detection
 
 # The store format that should be applied in the incoming directory.
 main-thread.incoming-dir.format = 
@@ -240,14 +247,14 @@ main-thread.type-extractor.data-set-type = HCS_IMAGE
 
 # The storage processor (IStorageProcessor implementation)
 main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
-main-thread.storage-processor.version = 1.1
-main-thread.storage-processor.sampleTypeCode = CELL_PLATE
-main-thread.storage-processor.sampleTypeDescription = Screening Plate
-main-thread.storage-processor.format = HCS_IMAGE V1.0
-main-thread.storage-processor.number_of_channels = 2
-main-thread.storage-processor.contains_original_data = TRUE
-main-thread.storage-processor.well_geometry = 3x3
-main-thread.storage-processor.file-extractor = ch.systemsx.cisd.etlserver.imsb.HCSImageFileExtractor
+#main-thread.storage-processor.version = 1.1
+#main-thread.storage-processor.sampleTypeCode = CELL_PLATE
+#main-thread.storage-processor.sampleTypeDescription = Screening Plate
+#main-thread.storage-processor.format = HCS_IMAGE V1.0
+#main-thread.storage-processor.number_of_channels = 2
+#main-thread.storage-processor.contains_original_data = TRUE
+#main-thread.storage-processor.well_geometry = 3x3
+#main-thread.storage-processor.file-extractor = ch.systemsx.cisd.etlserver.imsb.HCSImageFileExtractor
 
 # Path to the script that will be executed after successful data set registration. 
 # The script will be called with two parameters: <data-set-code> and <absolute-data-set-path> (in the data store).
@@ -393,6 +400,7 @@ archiver.synchronize-archive = true
 #   <plugin>.execute-only-once - If true the task will be executed exactly once, 
 #                                interval will be ignored. By default set to false.
 maintenance-plugins = auto-archiver
+#maintenance-plugins = auto-archiver, path-info-feeding
 
 # Performs automatic archivization of 'ACTIVE' data sets based on their properties
 auto-archiver.class = ch.systemsx.cisd.etlserver.plugins.AutoArchiverTask