diff --git a/Sources/XXClient/Callbacks/UdNetworkStatus.swift b/Sources/XXClient/Callbacks/UdNetworkStatus.swift
index 52a624a0567eb87fdb094521ca8ac30a82d95df7..43c7c88eb42d5828df7b5cf28de15c9dd82dccb3 100644
--- a/Sources/XXClient/Callbacks/UdNetworkStatus.swift
+++ b/Sources/XXClient/Callbacks/UdNetworkStatus.swift
@@ -2,16 +2,16 @@ import Bindings
 import XCTestDynamicOverlay
 
 public struct UdNetworkStatus {
-  public init(handle: @escaping () -> Int) {
+  public init(handle: @escaping () -> NetworkFollowerStatus) {
     self.handle = handle
   }
 
-  public var handle: () -> Int
+  public var handle: () -> NetworkFollowerStatus
 }
 
 extension UdNetworkStatus {
   public static let unimplemented = UdNetworkStatus(
-    handle: XCTUnimplemented("\(Self.self)", placeholder: -1)
+    handle: XCTUnimplemented("\(Self.self)", placeholder: .unknown(code: -1))
   )
 }
 
@@ -25,7 +25,7 @@ extension UdNetworkStatus {
       let callback: UdNetworkStatus
 
       func udNetworkStatus() -> Int {
-        callback.handle()
+        callback.handle().rawValue
       }
     }
 
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
index 229109681f2a618f451937208749a4b2d96a634d..7e6381c5d3f97121da31031112706626184fbdcb 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
@@ -33,7 +33,7 @@ extension MessengerLogIn {
           address: env.udAddress ?? e2e.getUdAddressFromNdf()
         ),
         follower: .init {
-          cMix.networkFollowerStatus().rawValue
+          cMix.networkFollowerStatus()
         }
       ))
     }
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
index 3286dac38601c40e385d59483049514d6b3c948a..116b1a1837b2fff29249f8ba51c3e4ef0aaae32a 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
@@ -35,7 +35,7 @@ extension MessengerRegister {
           address: env.udAddress ?? e2e.getUdAddressFromNdf()
         ),
         follower: .init {
-          cMix.networkFollowerStatus().rawValue
+          cMix.networkFollowerStatus()
         }
       ))
     }
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
index 83dd2cd02fc79fcb5d460d244c025d05590a2233..c0c3aaf3558ed14fa878b12bd80996ca3598a482 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
@@ -52,7 +52,7 @@ final class MessengerLogInTests: XCTestCase {
     XCTAssertEqual(didNewOrLoadUDWithFollower.count, 1)
     XCTAssertEqual(
       didNewOrLoadUDWithFollower.first?.handle(),
-      networkFollowerStatus.rawValue
+      networkFollowerStatus
     )
     XCTAssertEqual(didSetUD.compactMap { $0 }.count, 1)
   }
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
index ef96b25197a388e7b258a341638e053cb63ff3ad..ed48dc263326d52b26dd866f134fdbdae7bc2671 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
@@ -57,7 +57,7 @@ final class MessengerRegisterTests: XCTestCase {
     XCTAssertEqual(didNewOrLoadUDWithFollower.count, 1)
     XCTAssertEqual(
       didNewOrLoadUDWithFollower.first?.handle(),
-      networkFollowerStatus.rawValue
+      networkFollowerStatus
     )
     XCTAssertEqual(didSetUD.compactMap { $0 }.count, 1)
   }