diff --git a/debye_bec/scans/scan_plugin_template.py b/debye_bec/scans/scan_plugin_template.py
index bb8ea06..365970b 100644
--- a/debye_bec/scans/scan_plugin_template.py
+++ b/debye_bec/scans/scan_plugin_template.py
@@ -25,7 +25,8 @@ but they are executed in a specific order:
 
 # import numpy as np
 
-# from bec_lib import MessageEndpoints, bec_logger, messages
+# from bec_lib import bec_logger, messages
+# from bec_lib.endpoints import MessageEndpoints
 # from bec_server.scan_server.errors import ScanAbortion
 # from bec_server.scan_server.scans import FlyScanBase, RequestBase, ScanArgType, ScanBase
 
diff --git a/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py b/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py
index b536032..cbb38f2 100644
--- a/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py
+++ b/debye_bec/services/NIDAQ_writer/NIDAQ_writer.py
@@ -7,10 +7,12 @@ import traceback
 
 import h5py
 import numpy as np
-from bec_lib import MessageEndpoints, RedisConnector, ServiceConfig, bec_logger, messages
+from bec_lib import bec_logger, messages
 from bec_lib.bec_service import BECService
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.file_utils import FileWriter
-from bec_lib.redis_connector import MessageObject
+from bec_lib.redis_connector import MessageObject, RedisConnector
+from bec_lib.service_config import ServiceConfig
 
 logger = bec_logger.logger
 
diff --git a/debye_bec/services/NIDAQ_writer/scan_status.py b/debye_bec/services/NIDAQ_writer/scan_status.py
index f48bf97..a2c1268 100644
--- a/debye_bec/services/NIDAQ_writer/scan_status.py
+++ b/debye_bec/services/NIDAQ_writer/scan_status.py
@@ -1,4 +1,6 @@
-from bec_lib import MessageEndpoints, RedisConnector, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.redis_connector import RedisConnector
 
 
 def send_scan_status(scan_number, status):
diff --git a/debye_bec/services/NIDAQ_writer/utils/nidaq_sim.py b/debye_bec/services/NIDAQ_writer/utils/nidaq_sim.py
index 29953e8..be8832c 100644
--- a/debye_bec/services/NIDAQ_writer/utils/nidaq_sim.py
+++ b/debye_bec/services/NIDAQ_writer/utils/nidaq_sim.py
@@ -2,7 +2,8 @@ import threading
 import time
 
 import numpy as np
-from bec_lib import RedisConnector, messages
+from bec_lib import messages
+from bec_lib.redis_connector import RedisConnector
 
 
 class NIDAQSim(threading.Thread):
diff --git a/debye_bec/services/launch_writer.py b/debye_bec/services/launch_writer.py
index 1e67f98..a663411 100644
--- a/debye_bec/services/launch_writer.py
+++ b/debye_bec/services/launch_writer.py
@@ -1,7 +1,9 @@
 import argparse
 import threading
 
-from bec_lib import RedisConnector, ServiceConfig, bec_logger
+from bec_lib import bec_logger
+from bec_lib.redis_connector import RedisConnector
+from bec_lib.service_config import ServiceConfig
 
 from debye_bec.services.NIDAQ_writer import NIDAQWriterService
 
diff --git a/tests/tests_services/test_file_writer_service.py b/tests/tests_services/test_file_writer_service.py
index 7a8e830..dc09e39 100644
--- a/tests/tests_services/test_file_writer_service.py
+++ b/tests/tests_services/test_file_writer_service.py
@@ -2,8 +2,10 @@ from unittest import mock
 
 import numpy as np
 import pytest
-from bec_lib import MessageEndpoints, ServiceConfig, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.redis_connector import MessageObject
+from bec_lib.service_config import ServiceConfig
 
 from debye_bec.services.NIDAQ_writer import NIDAQWriterService