diff --git a/deep_sequencing_unit/dist/etc/service.properties b/deep_sequencing_unit/dist/etc/service.properties
index d51df92cae5434e5c1c206b24c141b02e59f4a32..b42a0a970102dea94ca1ba4e4c638db66cbb82a5 100644
--- a/deep_sequencing_unit/dist/etc/service.properties
+++ b/deep_sequencing_unit/dist/etc/service.properties
@@ -130,7 +130,7 @@ flow-cell.storage-processor.transfer.BSSE = data/drop-box-bsse
 
 # -------- Flow Lane 1 --------------------------------------
 fl1.incoming-dir = data/drop-box-1
-fl1.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
+fl1.data-set-info-extractor = ch.ethz.bsse.cisd.dsu.dss.FlowLaneDataSetInfoExtractor
 fl1.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
 fl1.data-set-info-extractor.index-of-group-code = 0
 fl1.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
@@ -140,7 +140,7 @@ fl1.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
 
 # -------- Flow Lane 2 --------------------------------------
 fl2.incoming-dir = data/drop-box-2
-fl2.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
+fl2.data-set-info-extractor = ch.ethz.bsse.cisd.dsu.dss.FlowLaneDataSetInfoExtractor
 fl2.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
 fl2.data-set-info-extractor.index-of-group-code = 0
 fl2.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
diff --git a/deep_sequencing_unit/etc/service.properties b/deep_sequencing_unit/etc/service.properties
index 2638c302af61191123611d2e14aebc2679fbae43..a3b84d2e3dee3922f4b444db5fcfbb2b9ef1249a 100644
--- a/deep_sequencing_unit/etc/service.properties
+++ b/deep_sequencing_unit/etc/service.properties
@@ -130,7 +130,7 @@ flow-cell.storage-processor.transfer.FMI = targets/playground/drop-box-fmi
 
 # -------- Flow Lane 1 --------------------------------------
 fl1.incoming-dir = targets/playground/drop-box-1
-fl1.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
+fl1.data-set-info-extractor = ch.ethz.bsse.cisd.dsu.dss.FlowLaneDataSetInfoExtractor
 fl1.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
 fl1.data-set-info-extractor.index-of-group-code = 0
 fl1.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
@@ -140,7 +140,7 @@ fl1.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
 
 # -------- Flow Lane 2 --------------------------------------
 fl2.incoming-dir = targets/playground/drop-box-2
-fl2.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
+fl2.data-set-info-extractor = ch.ethz.bsse.cisd.dsu.dss.FlowLaneDataSetInfoExtractor
 fl2.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
 fl2.data-set-info-extractor.index-of-group-code = 0
 fl2.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor