diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in
index 290840d..09e8774 100644
--- a/cmake/install-config.cmake.in
+++ b/cmake/install-config.cmake.in
@@ -1,8 +1,8 @@
 @PACKAGE_INIT@
 
-find_dependency(fmt REQUIRED)
-find_dependency(pasio-utility REQUIRED)
-find_dependency(pasio-core REQUIRED)
+find_package(Python REQUIRED)
+find_dependency(pybind11 REQUIRED)
+find_dependency(Boost REQUIRED)
 
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 check_required_components(@PROJECT_NAME@)
\ No newline at end of file
diff --git a/conanfile.py b/conanfile.py
index 57338b6..416444a 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -32,9 +32,6 @@ def fmt():
             return ["fmt::fmt"]
 
         project_components = [
-            {
-                "target": "utility",
-            },
             {
                 "target": "core",
                 "lib": "core",
@@ -72,7 +69,7 @@ def set_version(self):
     def requirements(self):
         self.requires("boost/1.86.0")
         self.requires("pybind11/2.13.6")
-        self.test_requires("catch2/3.5.3")
+        self.test_requires("catch2/3.8.0")
 
     def config_options(self):
         if self.settings.os == "Windows":
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index a2cacc5..3836a73 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -91,7 +91,7 @@ target_configure_linker(${PROJECT_NAME})
 
 # ---- Collect all sources for static analysis
 
-set(ALL_SOURCE_FILES ${LIBRARY_INCLUDES})
+set(ALL_SOURCE_FILES ${LIBRARY_INCLUDES} ${LIBRARY_SOURCES})
 
 # ---- Clang-tidy target
 
diff --git a/core/cmake/install-config.cmake.in b/core/cmake/install-config.cmake.in
index 072c6d0..d6b5824 100644
--- a/core/cmake/install-config.cmake.in
+++ b/core/cmake/install-config.cmake.in
@@ -2,8 +2,9 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(fmt REQUIRED)
-find_dependency(pasio-utility REQUIRED)
+find_package(Python REQUIRED)
+find_dependency(Boost REQUIRED)
+find_dependency(Pybind11 REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)
 check_required_components(@PROJECT_NAME@)