diff --git a/cloud/blockstore/libs/common/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/common/CMakeLists.darwin-x86_64.txt
index eab197d7df..528ec6b5d3 100644
--- a/cloud/blockstore/libs/common/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/common/CMakeLists.darwin-x86_64.txt
@@ -23,6 +23,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )
diff --git a/cloud/blockstore/libs/common/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/common/CMakeLists.linux-aarch64.txt
index 823389a173..e9e6785817 100644
--- a/cloud/blockstore/libs/common/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/common/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )
diff --git a/cloud/blockstore/libs/common/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/common/CMakeLists.linux-x86_64.txt
index 823389a173..e9e6785817 100644
--- a/cloud/blockstore/libs/common/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/common/CMakeLists.linux-x86_64.txt
@@ -24,6 +24,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )
diff --git a/cloud/blockstore/libs/common/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/common/CMakeLists.windows-x86_64.txt
index eab197d7df..528ec6b5d3 100644
--- a/cloud/blockstore/libs/common/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/common/CMakeLists.windows-x86_64.txt
@@ -23,6 +23,7 @@ target_sources(blockstore-libs-common PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/typeinfo.cpp
 )
diff --git a/cloud/blockstore/libs/common/ut/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/common/ut/CMakeLists.darwin-x86_64.txt
index 0c6fe0557b..3a43e8272c 100644
--- a/cloud/blockstore/libs/common/ut/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/common/ut/CMakeLists.darwin-x86_64.txt
@@ -15,6 +15,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -29,6 +30,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(
diff --git a/cloud/blockstore/libs/common/ut/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/common/ut/CMakeLists.linux-aarch64.txt
index cc3d5685e4..db225494f4 100644
--- a/cloud/blockstore/libs/common/ut/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/common/ut/CMakeLists.linux-aarch64.txt
@@ -15,6 +15,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -32,6 +33,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(
diff --git a/cloud/blockstore/libs/common/ut/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/common/ut/CMakeLists.linux-x86_64.txt
index d02e4c7a61..20f5931399 100644
--- a/cloud/blockstore/libs/common/ut/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/common/ut/CMakeLists.linux-x86_64.txt
@@ -16,6 +16,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -33,6 +34,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(
diff --git a/cloud/blockstore/libs/common/ut/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/common/ut/CMakeLists.windows-x86_64.txt
index 8d54bf84ec..17d934f445 100644
--- a/cloud/blockstore/libs/common/ut/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/common/ut/CMakeLists.windows-x86_64.txt
@@ -15,6 +15,7 @@ target_link_libraries(cloud-blockstore-libs-common-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
+  library-cpp-uri
   cpp-testing-unittest_main
   blockstore-libs-common
 )
@@ -22,6 +23,7 @@ target_sources(cloud-blockstore-libs-common-ut PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/caching_allocator_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_checksum_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/block_range_ut.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/device_path_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/common/iovector_ut.cpp
 )
 set_property(
diff --git a/cloud/blockstore/libs/endpoints/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/endpoints/CMakeLists.darwin-x86_64.txt
index 1df3737017..252796ba69 100644
--- a/cloud/blockstore/libs/endpoints/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/endpoints/CMakeLists.darwin-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp
diff --git a/cloud/blockstore/libs/endpoints/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/endpoints/CMakeLists.linux-aarch64.txt
index db3be1e289..1923ee5368 100644
--- a/cloud/blockstore/libs/endpoints/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/endpoints/CMakeLists.linux-aarch64.txt
@@ -24,6 +24,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp
diff --git a/cloud/blockstore/libs/endpoints/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/endpoints/CMakeLists.linux-x86_64.txt
index db3be1e289..1923ee5368 100644
--- a/cloud/blockstore/libs/endpoints/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/endpoints/CMakeLists.linux-x86_64.txt
@@ -24,6 +24,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp
diff --git a/cloud/blockstore/libs/endpoints/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/endpoints/CMakeLists.windows-x86_64.txt
index 1df3737017..252796ba69 100644
--- a/cloud/blockstore/libs/endpoints/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/endpoints/CMakeLists.windows-x86_64.txt
@@ -23,6 +23,7 @@ target_link_libraries(blockstore-libs-endpoints PUBLIC
   core-libs-keyring
 )
 target_sources(blockstore-libs-endpoints PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_events.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_listener.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/endpoint_manager.cpp
   ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/endpoints/service_endpoint.cpp
diff --git a/cloud/blockstore/libs/storage/testlib/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/testlib/CMakeLists.darwin-x86_64.txt
index 941257581a..c2682d26d3 100644
--- a/cloud/blockstore/libs/storage/testlib/CMakeLists.darwin-x86_64.txt
+++ b/cloud/blockstore/libs/storage/testlib/CMakeLists.darwin-x86_64.txt
@@ -16,6 +16,7 @@ target_link_libraries(blockstore-libs-storage-testlib PUBLIC
   yutil
   blockstore-libs-diagnostics
   blockstore-libs-discovery
+  blockstore-libs-endpoints
   blockstore-libs-kikimr
   blockstore-libs-service
   libs-storage-api
diff --git a/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-aarch64.txt
index cff1d08e7f..d6e896dcc1 100644
--- a/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-aarch64.txt
+++ b/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-aarch64.txt
@@ -17,6 +17,7 @@ target_link_libraries(blockstore-libs-storage-testlib PUBLIC
   yutil
   blockstore-libs-diagnostics
   blockstore-libs-discovery
+  blockstore-libs-endpoints
   blockstore-libs-kikimr
   blockstore-libs-service
   libs-storage-api
diff --git a/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-x86_64.txt
index cff1d08e7f..d6e896dcc1 100644
--- a/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-x86_64.txt
+++ b/cloud/blockstore/libs/storage/testlib/CMakeLists.linux-x86_64.txt
@@ -17,6 +17,7 @@ target_link_libraries(blockstore-libs-storage-testlib PUBLIC
   yutil
   blockstore-libs-diagnostics
   blockstore-libs-discovery
+  blockstore-libs-endpoints
   blockstore-libs-kikimr
   blockstore-libs-service
   libs-storage-api
diff --git a/cloud/blockstore/libs/storage/testlib/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/storage/testlib/CMakeLists.windows-x86_64.txt
index 941257581a..c2682d26d3 100644
--- a/cloud/blockstore/libs/storage/testlib/CMakeLists.windows-x86_64.txt
+++ b/cloud/blockstore/libs/storage/testlib/CMakeLists.windows-x86_64.txt
@@ -16,6 +16,7 @@ target_link_libraries(blockstore-libs-storage-testlib PUBLIC
   yutil
   blockstore-libs-diagnostics
   blockstore-libs-discovery
+  blockstore-libs-endpoints
   blockstore-libs-kikimr
   blockstore-libs-service
   libs-storage-api