diff --git a/CMakeLists.txt b/CMakeLists.txt
index 278fb71..242a211 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,24 +1,44 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(FENNECS Fortran C)
 
 
 find_package(MPI COMPONENTS Fortran REQUIRED)
 find_package(OpenMP COMPONENTS Fortran C REQUIRED)
+find_package(HDF5 COMPONENTS Fortran REQUIRED)
+
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
 # Search and load the FUTILS configuration file
 if(NOT TARGET futils)
 	find_package(futils PATHS ${FUTILS}/lib/cmake REQUIRED)
 endif()
 
 # Search and load the bsplines configuration file
 if(NOT TARGET bsplines)
     find_package(bsplines PATHS ${BSPLINES}/lib/cmake REQUIRED)
 endif()
 
 #Search and load the bsplines configuration file
-if(NOT TARGET SISL)
-    find_package(SISL PATHS ${SISL}/lib/cmake REQUIRED)
+if(NOT TARGET sisl)
+    find_package(sisl REQUIRED)
+endif()
+
+if(NOT TARGET forsSISL)
+    find_package(forSISL REQUIRED)
 endif()
 
-add_subdirectory(src)
\ No newline at end of file
+include(CMakeFlagsHandling)
+# Compiler flags for debug/optimization
+if(${CMAKE_Fortran_COMPILER_ID} MATCHES "Intel")
+  set(CMAKE_AR ${XIAR})
+  add_flags(LANG Fortran TYPE DEBUG -traceback "-check bounds" "-warn unused")
+  add_flags(LANG Fortran TYPE RELEASE -xHost -O3)
+elseif(${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
+  add_flags(LANG Fortran TYPE DEBUG -fbounds-check -fbacktrace)
+endif()
+
+
+
+add_subdirectory(src)