diff --git a/library/events/json_message_ready_event.nim b/library/events/json_message_ready_event.nim
index dd3864d..d64f251 100644
--- a/library/events/json_message_ready_event.nim
+++ b/library/events/json_message_ready_event.nim
@@ -2,9 +2,9 @@ import std/json
 import ./json_base_event, ../../src/[message]
 
 type JsonMessageReadyEvent* = ref object of JsonEvent
-  messageId*: MessageID
+  messageId*: SdsMessageID
 
-proc new*(T: type JsonMessageReadyEvent, messageId: MessageID): T =
+proc new*(T: type JsonMessageReadyEvent, messageId: SdsMessageID): T =
   return JsonMessageReadyEvent(eventType: "message_ready", messageId: messageId)
 
 method `$`*(jsonMessageReady: JsonMessageReadyEvent): string =
diff --git a/library/events/json_message_sent_event.nim b/library/events/json_message_sent_event.nim
index 3c60e36..a9c7439 100644
--- a/library/events/json_message_sent_event.nim
+++ b/library/events/json_message_sent_event.nim
@@ -2,9 +2,9 @@ import std/json
 import ./json_base_event, ../../src/[message]
 
 type JsonMessageSentEvent* = ref object of JsonEvent
-  messageId*: MessageID
+  messageId*: SdsMessageID
 
-proc new*(T: type JsonMessageSentEvent, messageId: MessageID): T =
+proc new*(T: type JsonMessageSentEvent, messageId: SdsMessageID): T =
   return JsonMessageSentEvent(eventType: "message_sent", messageId: messageId)
 
 method `$`*(jsonMessageSent: JsonMessageSentEvent): string =
diff --git a/library/events/json_missing_dependencies_event.nim b/library/events/json_missing_dependencies_event.nim
index 0468738..b7af04c 100644
--- a/library/events/json_missing_dependencies_event.nim
+++ b/library/events/json_missing_dependencies_event.nim
@@ -2,13 +2,13 @@ import std/json
 import ./json_base_event, ../../src/[message]
 
 type JsonMissingDependenciesEvent* = ref object of JsonEvent
-  messageId*: MessageID
-  missingDeps: seq[MessageID]
+  messageId*: SdsMessageID
+  missingDeps: seq[SdsMessageID]
 
 proc new*(
     T: type JsonMissingDependenciesEvent,
-    messageId: MessageID,
-    missingDeps: seq[MessageID],
+    messageId: SdsMessageID,
+    missingDeps: seq[SdsMessageID],
 ): T =
   return JsonMissingDependenciesEvent(
     eventType: "missing_dependencies", messageId: messageId, missingDeps: missingDeps
diff --git a/library/libsds.nim b/library/libsds.nim
index 5d9f669..90d3b83 100644
--- a/library/libsds.nim
+++ b/library/libsds.nim
@@ -72,17 +72,17 @@ proc handleRequest(
   return RET_OK
 
 proc onMessageReady(ctx: ptr SdsContext): MessageReadyCallback =
-  return proc(messageId: MessageID) {.gcsafe.} =
+  return proc(messageId: SdsMessageID) {.gcsafe.} =
     callEventCallback(ctx, "onMessageReady"):
       $JsonMessageReadyEvent.new(messageId)
 
 proc onMessageSent(ctx: ptr SdsContext): MessageSentCallback =
-  return proc(messageId: MessageID) {.gcsafe.} =
+  return proc(messageId: SdsMessageID) {.gcsafe.} =
     callEventCallback(ctx, "onMessageSent"):
       $JsonMessageSentEvent.new(messageId)
 
 proc onMissingDependencies(ctx: ptr SdsContext): MissingDependenciesCallback =
-  return proc(messageId: MessageID, missingDeps: seq[MessageID]) {.gcsafe.} =
+  return proc(messageId: SdsMessageID, missingDeps: seq[SdsMessageID]) {.gcsafe.} =
     callEventCallback(ctx, "onMissingDependencies"):
       $JsonMissingDependenciesEvent.new(messageId, missingDeps)
 
diff --git a/library/sds_thread/inter_thread_communication/requests/sds_lifecycle_request.nim b/library/sds_thread/inter_thread_communication/requests/sds_lifecycle_request.nim
index 717e310..2307fce 100644
--- a/library/sds_thread/inter_thread_communication/requests/sds_lifecycle_request.nim
+++ b/library/sds_thread/inter_thread_communication/requests/sds_lifecycle_request.nim
@@ -38,7 +38,7 @@ proc createReliabilityManager(
     error "Failed creating ReliabilityManager: Channel ID cannot be empty"
     return err("Failed creating ReliabilityManager: Channel ID cannot be empty")
 
-  let rm = newReliabilityManager(channelId).valueOr:
+  let rm = newReliabilityManager(some(channelId)).valueOr:
     error "Failed creating reliability manager", error = error
     return err("Failed creating reliability manager: " & $error)
 
diff --git a/library/sds_thread/inter_thread_communication/requests/sds_message_request.nim b/library/sds_thread/inter_thread_communication/requests/sds_message_request.nim
index 6917ccf..476a65e 100644
--- a/library/sds_thread/inter_thread_communication/requests/sds_message_request.nim
+++ b/library/sds_thread/inter_thread_communication/requests/sds_message_request.nim
@@ -16,7 +16,7 @@ type SdsMessageRequest* = object
 
 type SdsUnwrapResponse* = object
   message*: seq[byte]
-  missingDeps*: seq[MessageID]
+  missingDeps*: seq[SdsMessageID]
 
 proc createShared*(
     T: type SdsMessageRequest,