diff --git a/services/CurrentTime/CMakeLists.txt b/services/CurrentTime/CMakeLists.txt
new file mode 100644
index 0000000..e97d3dd
--- /dev/null
+++ b/services/CurrentTime/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(ble-service-current-time INTERFACE)
+
+target_include_directories(ble-service-current-time
+    INTERFACE
+        . 
+        include
+)
+
+target_sources(ble-service-current-time
+    INTERFACE
+        source/CurrentTimeService.cpp
+)
+
+target_link_libraries(ble-service-current-time
+    INTERFACE
+        mbed-ble
+        mbed-events
+        mbed-core
+)
+
+
diff --git a/services/CurrentTime/source/CurrentTimeService.cpp b/services/CurrentTime/source/CurrentTimeService.cpp
index 10a7cd5..861f6ad 100644
--- a/services/CurrentTime/source/CurrentTimeService.cpp
+++ b/services/CurrentTime/source/CurrentTimeService.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "CurrentTimeService.h"
+#include "ble-service-current-time/CurrentTimeService.h"
 
 #define CURRENT_TIME_CHAR_VALUE_SIZE 10
 #define DATA_FIELD_IGNORED 0x80
@@ -27,7 +27,11 @@ constexpr std::chrono::seconds CurrentTimeService::UPDATE_TIME_PERIOD;
 CurrentTimeService::CurrentTimeService(BLE &ble, events::EventQueue &event_queue) :
     _ble(ble),
     _event_queue(event_queue),
-    _current_time_char(GattCharacteristic::UUID_CURRENT_TIME_CHAR, &_current_time)
+    _current_time_char(
+        GattCharacteristic::UUID_CURRENT_TIME_CHAR,
+        &_current_time,
+        GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY
+    )
 {
 }
 
diff --git a/services/LinkLoss/CMakeLists.txt b/services/LinkLoss/CMakeLists.txt
new file mode 100644
index 0000000..3f6555b
--- /dev/null
+++ b/services/LinkLoss/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(ble-service-link-loss INTERFACE)
+
+target_include_directories(ble-service-link-loss
+    INTERFACE
+        .
+        include
+)
+
+target_sources(ble-service-link-loss
+    INTERFACE
+        source/LinkLossService.cpp
+)
+
+target_link_libraries(ble-service-link-loss
+    INTERFACE
+        mbed-ble
+        mbed-events
+)