diff --git a/producer/event_monitor_producer/src/eventmon_config.cpp b/producer/event_monitor_producer/src/eventmon_config.cpp
index 24882a220eab1a2e8b60b25b42e37d7e2b29912c..cb591e42ec168a2ec5600f7e4a2fc3ceaf3bb04d 100644
--- a/producer/event_monitor_producer/src/eventmon_config.cpp
+++ b/producer/event_monitor_producer/src/eventmon_config.cpp
@@ -39,13 +39,15 @@ Error EventMonConfigFactory::ParseConfigFile(std::string file_name) {
     (err = parser.GetString("AsapoEndpoint", &config.asapo_endpoint)) ||
     (err = parser.GetString("Tag", &config.tag)) ||
     (err = parser.GetString("BeamtimeID", &config.beamtime_id)) ||
+    (err = parser.GetString("Stream", &config.stream)) ||
     (err = parser.GetString("Mode", &config.mode_str)) ||
     (err = parser.GetUInt64("NThreads", &config.nthreads)) ||
     (err = parser.GetString("RootMonitoredFolder", &config.root_monitored_folder)) ||
     (err = parser.GetString("LogLevel", &config.log_level_str)) ||
     (err = parser.GetBool("RemoveAfterSend", &config.remove_after_send)) ||
     (err = parser.GetArrayString("MonitoredSubFolders", &config.monitored_subfolders)) ||
-    (err = parser.GetArrayString("IgnoreExtentions", &config.ignored_extentions)) ||
+    (err = parser.GetArrayString("IgnoreExtensions", &config.ignored_extensions)) ||
+    (err = parser.GetArrayString("WhitelistExtensions", &config.whitelisted_extensions)) ||
     (err = parser.Embedded("Subset").GetString("Mode", &subset_mode)) ||
     (err = SubsetModeToEnum(subset_mode, &config.subset_mode));
     if (err) {
@@ -104,7 +106,6 @@ Error EventMonConfigFactory::CheckLogLevel() {
     return err;
 }
 
-
 Error EventMonConfigFactory::CheckNThreads() {
     if (config.nthreads == 0 || config.nthreads > kMaxProcessingThreads ) {
         return  TextError("NThreads should between 1 and " + std::to_string(kMaxProcessingThreads));
diff --git a/producer/event_monitor_producer/src/eventmon_config.h b/producer/event_monitor_producer/src/eventmon_config.h
index bbdd82bc2d319fc9f468ec5a74d99bf97548db6d..1f042ca49b786e58fa86fe4ed165aade6c054fef 100644
--- a/producer/event_monitor_producer/src/eventmon_config.h
+++ b/producer/event_monitor_producer/src/eventmon_config.h
@@ -24,12 +24,14 @@ struct EventMonConfig {
     RequestHandlerType mode = RequestHandlerType::kTcp;
     std::string root_monitored_folder;
     std::vector<std::string> monitored_subfolders;
-    std::vector<std::string> ignored_extentions;
+    std::vector<std::string> ignored_extensions;
+    std::vector<std::string> whitelisted_extensions;
     bool remove_after_send = false;
     SubSetMode subset_mode = SubSetMode::kNone;
     uint64_t subset_batch_size = 1;
     uint64_t subset_multisource_nsources = 1;
     uint64_t subset_multisource_sourceid = 1;
+    std::string stream;
   private:
     std::string log_level_str;
     std::string mode_str;
diff --git a/producer/event_monitor_producer/src/eventmon_config_factory.h b/producer/event_monitor_producer/src/eventmon_config_factory.h
index 933feb2b994ceea7e75dfe3b909c39964a086af0..dd46ce76f170c406a6a74dbbf7bfee159a886e52 100644
--- a/producer/event_monitor_producer/src/eventmon_config_factory.h
+++ b/producer/event_monitor_producer/src/eventmon_config_factory.h
@@ -19,7 +19,6 @@ class EventMonConfigFactory {
     Error CheckSubsets();
     Error CheckNThreads();
     Error CheckConfig();
-
 };
 
 }
diff --git a/producer/event_monitor_producer/src/folder_event_detector.cpp b/producer/event_monitor_producer/src/folder_event_detector.cpp
index ab85d2054f83c35cf492c9663389a53765325f2f..c3552368abd455416726d399dc65a0d888b76b30 100644
--- a/producer/event_monitor_producer/src/folder_event_detector.cpp
+++ b/producer/event_monitor_producer/src/folder_event_detector.cpp
@@ -15,8 +15,8 @@ inline bool ends_with(std::string const& value, std::string const& ending) {
 }
 
 
-bool FolderEventDetector::IgnoreFile(const std::string& file) {
-    for (auto& ext : config_->ignored_extentions) {
+bool FileInList(const std::vector<std::string>& list, const std::string& file) {
+    for (auto& ext : list) {
         if (ends_with(file, ext)) {
             return true;
         }
@@ -24,6 +24,17 @@ bool FolderEventDetector::IgnoreFile(const std::string& file) {
     return false;
 }
 
+bool FolderEventDetector::IgnoreFile(const std::string& file) {
+    return FileInList(config_->ignored_extensions, file);
+}
+
+bool FolderEventDetector::FileInWhiteList(const std::string& file) {
+    if (config_->whitelisted_extensions.empty()) {
+        return true;
+    }
+    return FileInList(config_->whitelisted_extensions, file);
+}
+
 
 Error FolderEventDetector::UpdateEventsBuffer() {
     Error err;
@@ -37,7 +48,7 @@ Error FolderEventDetector::UpdateEventsBuffer() {
     }
 
     for (auto& file : files) {
-        if (!IgnoreFile(file)) {
+        if (!IgnoreFile(file) && FileInWhiteList(file) ) {
             events_buffer_.emplace_back(EventHeader{0, 0, file});
         }
     }
diff --git a/producer/event_monitor_producer/src/folder_event_detector.h b/producer/event_monitor_producer/src/folder_event_detector.h
index 472fc451ae1fb1a8bb92041041b9bf8271a5ccd1..9e6c99f940c314cc58f69432cabe123a1c02a865 100644
--- a/producer/event_monitor_producer/src/folder_event_detector.h
+++ b/producer/event_monitor_producer/src/folder_event_detector.h
@@ -25,6 +25,7 @@ class FolderEventDetector : public AbstractEventDetector {
     Error UpdateEventsBuffer();
     Error GetHeaderFromBuffer(EventHeader* event_header);
     bool IgnoreFile(const std::string& event);
+    bool FileInWhiteList(const std::string& file);
     bool BufferIsEmpty() const;
 };
 
diff --git a/producer/event_monitor_producer/src/main_eventmon.cpp b/producer/event_monitor_producer/src/main_eventmon.cpp
index e23fb03e65697c13d417b417bd7cb126d0332bff..e277e7b111866f18a2fa0c614987bd2b189c577c 100644
--- a/producer/event_monitor_producer/src/main_eventmon.cpp
+++ b/producer/event_monitor_producer/src/main_eventmon.cpp
@@ -39,7 +39,7 @@ std::unique_ptr<Producer> CreateProducer() {
 
     Error err;
     auto producer = Producer::Create(config->asapo_endpoint, (uint8_t) config->nthreads,
-                                     config->mode, asapo::SourceCredentials{config->beamtime_id, "", ""}, &err);
+                                     config->mode, asapo::SourceCredentials{config->beamtime_id, config->stream, ""}, &err);
     if(err) {
         std::cerr << "cannot create producer: " << err << std::endl;
         exit(EXIT_FAILURE);
@@ -57,6 +57,9 @@ void ProcessAfterSend(asapo::GenericRequestHeader header, asapo::Error err) {
         return;
     }
     auto config = GetEventMonConfig();
+    if (!config->remove_after_send) {
+        return;
+    }
     std::string fname = config->root_monitored_folder + asapo::kPathSeparator + header.message;
     auto error = io->RemoveFile(fname);
     if (error) {
diff --git a/producer/event_monitor_producer/unittests/mock_eventmon_config.cpp b/producer/event_monitor_producer/unittests/mock_eventmon_config.cpp
index bf3be313969dac4ad8a52d46e7a31c7a72b98c4e..35fbf17fb638b94a4e6d4ff8a7f0a869d6277ebc 100644
--- a/producer/event_monitor_producer/unittests/mock_eventmon_config.cpp
+++ b/producer/event_monitor_producer/unittests/mock_eventmon_config.cpp
@@ -49,6 +49,7 @@ Error SetFolderMonConfig (const EventMonConfig& config) {
     config_string += "," + std::string("\"NThreads\":") + std::to_string(config.nthreads);
     config_string += "," + std::string("\"LogLevel\":") + "\"" + log_level + "\"";
     config_string += "," + std::string("\"RemoveAfterSend\":") + (config.remove_after_send ? "true" : "false");
+    config_string += "," + std::string("\"Stream\":") + "\"" + config.stream + "\"";
 
     std::string subset_mode;
     switch (config.subset_mode) {
@@ -85,7 +86,7 @@ Error SetFolderMonConfig (const EventMonConfig& config) {
     }
 
     std::string ignored_exts;
-    for (auto ext : config.ignored_extentions) {
+    for (auto ext : config.ignored_extensions) {
         ignored_exts += "\"" + ext + "\"" + ",";
     }
     if (ignored_exts.size()) {
@@ -93,9 +94,19 @@ Error SetFolderMonConfig (const EventMonConfig& config) {
     }
 
 
+    std::string whitelisted_exts;
+    for (auto ext : config.whitelisted_extensions) {
+        whitelisted_exts += "\"" + ext + "\"" + ",";
+    }
+    if (whitelisted_exts.size()) {
+        whitelisted_exts.pop_back();
+    }
+
     config_string += "," + std::string("\"MonitoredSubFolders\":") + "[" + mon_folders + "]";
     config_string += "," + std::string("\"RootMonitoredFolder\":") + "\"" + config.root_monitored_folder + "\"";
-    config_string += "," + std::string("\"IgnoreExtentions\":") + "[" + ignored_exts + "]";
+    config_string += "," + std::string("\"IgnoreExtensions\":") + "[" + ignored_exts + "]";
+    config_string += "," + std::string("\"WhitelistExtensions\":") + "[" + whitelisted_exts + "]";
+
     config_string += "," + std::string("\"Tag\":") + "\"" + config.tag + "\"";
     config_string += "," + std::string("\"AsapoEndpoint\":") + "\"" + config.asapo_endpoint + "\"";
 
diff --git a/producer/event_monitor_producer/unittests/test_eventmon_config.cpp b/producer/event_monitor_producer/unittests/test_eventmon_config.cpp
index 544f12cbb42cabe7ede883d535b7ed17875e9a31..65251c0a1733b907c00cdb0e1b7543baadeff183 100644
--- a/producer/event_monitor_producer/unittests/test_eventmon_config.cpp
+++ b/producer/event_monitor_producer/unittests/test_eventmon_config.cpp
@@ -60,10 +60,13 @@ TEST_F(ConfigTests, ReadSettingsOK) {
     test_config.mode = asapo::RequestHandlerType::kTcp;
     test_config.root_monitored_folder = "tmp";
     test_config.monitored_subfolders = {"test1", "test2"};
-    test_config.ignored_extentions = {"tmp", "test"};
+    test_config.ignored_extensions = {"tmp", "test"};
     test_config.remove_after_send = true;
     test_config.subset_mode = SubSetMode::kBatch;
     test_config.subset_batch_size = 9;
+    test_config.stream = "stream";
+    test_config.whitelisted_extensions =  {"bla"};
+
     auto err = asapo::SetFolderMonConfig(test_config);
 
     auto config = asapo::GetEventMonConfig();
@@ -77,12 +80,25 @@ TEST_F(ConfigTests, ReadSettingsOK) {
     ASSERT_THAT(config->mode, Eq(asapo::RequestHandlerType::kTcp));
     ASSERT_THAT(config->monitored_subfolders, ElementsAre("test1", "test2"));
     ASSERT_THAT(config->root_monitored_folder, Eq("tmp"));
-    ASSERT_THAT(config->ignored_extentions, ElementsAre("tmp", "test"));
+    ASSERT_THAT(config->ignored_extensions, ElementsAre("tmp", "test"));
     ASSERT_THAT(config->remove_after_send, Eq(true));
     ASSERT_THAT(config->subset_mode, Eq(SubSetMode::kBatch));
     ASSERT_THAT(config->subset_batch_size, Eq(9));
+    ASSERT_THAT(config->stream, Eq("stream"));
+}
 
 
+TEST_F(ConfigTests, ReadSettingsWhiteListOK) {
+    asapo::EventMonConfig test_config;
+    test_config.whitelisted_extensions =  {"tmp", "test"};
+    test_config.ignored_extensions = {};
+
+    auto err = asapo::SetFolderMonConfig(test_config);
+
+    auto config = asapo::GetEventMonConfig();
+
+    ASSERT_THAT(err, Eq(nullptr));
+    ASSERT_THAT(config->whitelisted_extensions,  ElementsAre("tmp", "test"));
 }
 
 TEST_F(ConfigTests, ReadSettingsMultiSourceOK) {
diff --git a/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp b/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp
index b2cce0399f0114a625936f2a0de4bed34c3c5f2a..cc46787dd38854b2d5a98e3f1cac3a4655f40330 100644
--- a/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp
+++ b/producer/event_monitor_producer/unittests/test_folder_event_detector.cpp
@@ -65,7 +65,7 @@ class FolderEventDetectorTests : public testing::Test {
     }
     void MockStartMonitoring();
     void MockGetEvents();
-    void InitiateAndReadSingleEvent();
+    asapo::EventHeader InitiateAndReadSingleEvent();
 };
 
 void FolderEventDetectorTests::MockStartMonitoring() {
@@ -153,13 +153,14 @@ void FolderEventDetectorTests::MockGetEvents() {
         ));
 }
 
-void FolderEventDetectorTests::InitiateAndReadSingleEvent() {
+asapo::EventHeader FolderEventDetectorTests::InitiateAndReadSingleEvent() {
     MockStartMonitoring();
     MockGetEvents();
     detector.StartMonitoring();
     asapo::EventHeader event_header;
     detector.GetNextEvent(&event_header);
     Mock::VerifyAndClearExpectations(&mock_system_folder_watch);
+    return event_header;
 };
 
 
@@ -210,7 +211,7 @@ TEST_F(FolderEventDetectorTests, GetNextEventDoesSystemCallIfListEmpty) {
 }
 
 TEST_F(FolderEventDetectorTests, GetNextIgnoresTmpFiles) {
-    test_config.ignored_extentions = {"tmp"};
+    test_config.ignored_extensions = {"tmp"};
     InitiateAndReadSingleEvent();
     asapo::EventHeader event_header;
     err = detector.GetNextEvent(&event_header);
@@ -222,6 +223,13 @@ TEST_F(FolderEventDetectorTests, GetNextIgnoresTmpFiles) {
     ASSERT_THAT(err, Eq(asapo::EventMonitorErrorTemplates::kNoNewEvent));
 }
 
+TEST_F(FolderEventDetectorTests, GetNextRespectsWhiteList) {
+    test_config.whitelisted_extensions = {"tmp"};
+    auto event_header = InitiateAndReadSingleEvent();
+    ASSERT_THAT(err, Eq(nullptr));
+    ASSERT_THAT(event_header.file_name, Eq("test3.tmp"));
+}
+
 }
 
 
diff --git a/tests/automatic/bug_fixes/producer_send_after_restart/test.json.in b/tests/automatic/bug_fixes/producer_send_after_restart/test.json.in
index 995984533959e3caedd3d29d64be1cfb83a10c44..d74bd52ebcf85d75b4e1533dd0288b71337dc4b2 100644
--- a/tests/automatic/bug_fixes/producer_send_after_restart/test.json.in
+++ b/tests/automatic/bug_fixes/producer_send_after_restart/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
diff --git a/tests/automatic/bug_fixes/receiver_cpu_usage/test.json.in b/tests/automatic/bug_fixes/receiver_cpu_usage/test.json.in
index 4b7d3fc60d8c8d77e669bba405b93e955a55f03f..7cfebfb26d502bb8699b5f199d178457c9a38872 100644
--- a/tests/automatic/bug_fixes/receiver_cpu_usage/test.json.in
+++ b/tests/automatic/bug_fixes/receiver_cpu_usage/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
diff --git a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
index 144bee18c8e4e3861e0ed8888b77446b9d4207e6..60400967e41438229d1afdca3ff16f079b207d31 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
@@ -52,3 +52,7 @@ echo hello > /tmp/asapo/test_in/test1/file2
 echo hello > /tmp/asapo/test_in/test2/file2
 
 $2 ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 1000 1 | tee /dev/stderr | grep "Processed 3 file(s)"
+
+test ! -f /tmp/asapo/test_in/test1/file1
+test ! -f /tmp/asapo/test_in/test1/file2
+test ! -f /tmp/asapo/test_in/test2/file2
diff --git a/tests/automatic/full_chain/simple_chain_filegen/test.json.in b/tests/automatic/full_chain/simple_chain_filegen/test.json.in
index 758d184a81e40e342b9ca3c75118b6447393e10d..3c77ba335ac934c2b4ce32e9f531e21b56058709 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/test.json.in
+++ b/tests/automatic/full_chain/simple_chain_filegen/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1","test2"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
   "Subset": {
    	"Mode":"none"
   }
diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
index 11507ac796ecde0c8f67d1a4539f47ec39e3e489..a0a3fea6de4d7800cc583336f013181faac57861 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
@@ -56,3 +56,7 @@ $2 ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 2000 1 1 > out
 cat out
 cat out   | grep "Processed 1 dataset(s)"
 cat out   | grep "with 3 file(s)"
+
+test -f /tmp/asapo/test_in/test1/file1
+test -f /tmp/asapo/test_in/test1/file2
+test -f /tmp/asapo/test_in/test2/file2
diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/test.json.in b/tests/automatic/full_chain/simple_chain_filegen_batches/test.json.in
index 3f25b85fe0a9ffb652ad740b0ed78cb4c0f13aae..f1323b8ee05f6d835a632779eb362354d9595b74 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_batches/test.json.in
+++ b/tests/automatic/full_chain/simple_chain_filegen_batches/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1","test2"],
- "IgnoreExtentions":["tmp"],
- "RemoveAfterSend":true,
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
+ "RemoveAfterSend":false,
+ "Stream": "",
  "Subset": {
  	"Mode":"batch",
   	"BatchSize":3
diff --git a/tests/automatic/full_chain/simple_chain_filegen_multisource/test.json.in b/tests/automatic/full_chain/simple_chain_filegen_multisource/test.json.in
index 6318341dd71cc62b6ae0d808993f1c2721611027..eadb0bb3eeb9603bf30bf3e0d0de13376095de82 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_multisource/test.json.in
+++ b/tests/automatic/full_chain/simple_chain_filegen_multisource/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test@ID@"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
  	"Mode":"multisource",
   	"SourceId":@ID@,
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/test.json.in b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/test.json.in
index b7b1f67605fd45d7047f0706cc73bd964ae9869a..9addfcceb52b30c4449268cb140fa04700306a59 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/test.json.in
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1","test2"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/test.json.in b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/test.json.in
index b7b1f67605fd45d7047f0706cc73bd964ae9869a..9addfcceb52b30c4449268cb140fa04700306a59 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/test.json.in
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1","test2"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
diff --git a/tests/automatic/producer/file_monitor_producer/test.json.in b/tests/automatic/producer/file_monitor_producer/test.json.in
index 088681a0ddc231f34ebd9c66b3a5809150f0bbc8..d88d98b67bd0a0e5264c1169071210c13325c746 100644
--- a/tests/automatic/producer/file_monitor_producer/test.json.in
+++ b/tests/automatic/producer/file_monitor_producer/test.json.in
@@ -7,8 +7,10 @@
  "LogLevel":"debug",
  "RootMonitoredFolder":"@ROOT_PATH@test_in",
  "MonitoredSubFolders":["test1","test2"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
diff --git a/tests/automatic/producer/python_api/producer_api.py b/tests/automatic/producer/python_api/producer_api.py
index a83a6b5e42c6c2201b425a822f0298c343330f45..b2c80dc012ca3ef4a8c8585747152ff6de1e775d 100644
--- a/tests/automatic/producer/python_api/producer_api.py
+++ b/tests/automatic/producer/python_api/producer_api.py
@@ -44,15 +44,15 @@ producer.send_file(3, local_path = "./not_exist",exposed_path = "./whatever",
 data = np.arange(10,dtype=np.float64)
 
 #send data from array
-err = producer.send_data(4, stream+"/"+"file5",data,
+producer.send_data(4, stream+"/"+"file5",data,
                          ingest_mode = asapo_producer.DEFAULT_INGEST_MODE, callback = callback)
 
 #send data from string
-err = producer.send_data(5, stream+"/"+"file6",b"hello",
+producer.send_data(5, stream+"/"+"file6",b"hello",
                          ingest_mode = asapo_producer.DEFAULT_INGEST_MODE, callback = callback)
 
 #send metadata only
-err = producer.send_data(6, stream+"/"+"file7",None,
+producer.send_data(6, stream+"/"+"file7",None,
                          ingest_mode = asapo_producer.INGEST_MODE_TRANSFER_METADATA_ONLY, callback = callback)
 
 
@@ -67,6 +67,6 @@ else:
 
 
 
-time.sleep(5)
+time.sleep(10)
 
 
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in
index 250a268036d383197c72106e42ca991914c4b781..929d44cd0270da08cabd3c780fb8e5181c61ad36 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon.nomad.in
@@ -38,8 +38,10 @@ job "asapo-filemon" {
  "LogLevel":"info",
  "RootMonitoredFolder":"u:\\asapo",
  "MonitoredSubFolders":["test_folder"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
@@ -97,8 +99,10 @@ job "asapo-filemon" {
  "LogLevel":"info",
  "RootMonitoredFolder":"/run/user",
  "MonitoredSubFolders":["data"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in
index 85e5872e9029e5ff696225e11f520b9781ebc6af..eb73199f22c88df43e3534345b7464296a904021 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_batch.nomad.in
@@ -38,8 +38,10 @@ job "asapo-filemon_batch" {
  "LogLevel":"info",
  "RootMonitoredFolder":"u:\\asapo",
  "MonitoredSubFolders":["test_folder"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"batch",
   	"BatchSize": {{ keyOrDefault "monitor_batch_size" "3" }}
@@ -98,8 +100,10 @@ job "asapo-filemon_batch" {
  "LogLevel":"info",
  "RootMonitoredFolder":"/run/user",
  "MonitoredSubFolders":["data"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"batch",
   	"BatchSize": {{ keyOrDefault "monitor_batch_size" "3" }}
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in
index 2a6159367306c3d349492fd3d740dbdadc7d89b0..9d277950f8afc05862ca2a2034698d7a3359776d 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_multisource.nomad.in
@@ -38,8 +38,10 @@ job "asapo-filemon_multisource" {
  "LogLevel":"info",
  "RootMonitoredFolder":"u:\\asapo",
  "MonitoredSubFolders":["test_folder"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"multisource",
   	"SourceId": 1,
@@ -99,8 +101,10 @@ job "asapo-filemon_multisource" {
  "LogLevel":"info",
  "RootMonitoredFolder":"/run/user",
  "MonitoredSubFolders":["data"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"multisource",
   	"SourceId": 2,
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad.in b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad.in
index e40fe1738f8fd6bd9f627200769a1cc60afab290..b627fe8701b27a7fb9c3daa8f6ed69c9437dad9e 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad.in
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad.in
@@ -38,8 +38,10 @@ job "asapo-produceronly" {
  "LogLevel":"debug",
  "RootMonitoredFolder":"c:\\tmp\\asapo\\test_in",
  "MonitoredSubFolders":["test_folder"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
   "Subset": {
    	"Mode":"none"
   }
@@ -97,8 +99,10 @@ job "asapo-produceronly" {
  "LogLevel":"debug",
  "RootMonitoredFolder":"/tmp/asapo/test_in",
  "MonitoredSubFolders":["test_folder"],
- "IgnoreExtentions":["tmp"],
+ "IgnoreExtensions":["tmp"],
+ "WhitelistExtensions":[],
  "RemoveAfterSend":true,
+ "Stream": "",
  "Subset": {
   	"Mode":"none"
  }