diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Bindings b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Bindings
index abf4d8981a3a5fba3a919da91f3d5fcc55f31dfa..ebf7d9f8c3a77aa7de06439f7c83a7e8d4d5a691 100644
Binary files a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Bindings differ
diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Headers/Bindings.objc.h
index 525c5d58f7977f0c8be4a79a023d321675f37b10..2acd7d58607297732a3a8fcb3cb8048738342fa0 100644
--- a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Headers/Bindings.objc.h
+++ b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Headers/Bindings.objc.h
@@ -767,6 +767,22 @@ Returns:
  - []byte - the marshalled bytes of the id.ID object.
  */
 - (NSData* _Nullable)getReceptionID;
+/**
+ * GetUdAddressFromNdf retrieve the User Discovery's network address fom the NDF.
+ */
+- (NSString* _Nonnull)getUdAddressFromNdf;
+/**
+ * GetUdCertFromNdf retrieves the User Discovery's TLS certificate from the NDF.
+ */
+- (NSData* _Nullable)getUdCertFromNdf;
+/**
+ * GetUdContactFromNdf assembles the User Discovery's contact file from the data
+within the NDF.
+
+Returns
+ - []byte - A byte marshalled contact.Contact.
+ */
+- (NSData* _Nullable)getUdContactFromNdf:(NSError* _Nullable* _Nullable)error;
 /**
  * HasAuthenticatedChannel returns true if an authenticated channel with the
 partner exists, otherwise returns false.
@@ -1579,19 +1595,6 @@ Parameters:
  - factJson - a JSON marshalled fact.Fact
  */
 - (NSString* _Nonnull)sendRegisterFact:(NSData* _Nullable)factJson error:(NSError* _Nullable* _Nullable)error;
-/**
- * SetAlternativeUserDiscovery sets the alternativeUd object within manager.
-Once set, any user discovery operation will go through the alternative
-user discovery service.
-
-To undo this operation, use UnsetAlternativeUserDiscovery.
- */
-- (BOOL)setAlternativeUserDiscovery:(NSData* _Nullable)altCert altAddress:(NSData* _Nullable)altAddress contactFile:(NSData* _Nullable)contactFile error:(NSError* _Nullable* _Nullable)error;
-/**
- * UnsetAlternativeUserDiscovery clears out the information from the Manager
-object.
- */
-- (BOOL)unsetAlternativeUserDiscovery:(NSError* _Nullable* _Nullable)error;
 @end
 
 /**
@@ -1773,19 +1776,6 @@ subprocesses to perform network operations.
  */
 FOUNDATION_EXPORT BindingsCmix* _Nullable BindingsLoadCmix(NSString* _Nullable storageDir, NSData* _Nullable password, NSData* _Nullable cmixParamsJSON, NSError* _Nullable* _Nullable error);
 
-/**
- * LoadOrNewUserDiscovery creates a bindings-level user discovery manager.
-
-Parameters:
- - e2eID - e2e object ID in the tracker
- - follower - network follower func wrapped in UdNetworkStatus
- - username - the username the user wants to register with UD.
-   If the user is already registered, this field may be blank
- - registrationValidationSignature - the signature provided by the xx network.
-   This signature is optional for other consumers who deploy their own UD.
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsLoadOrNewUserDiscovery(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSError* _Nullable* _Nullable error);
-
 /**
  * LoadReceptionIdentity loads the given identity in Cmix storage with the given
 key.
@@ -1889,6 +1879,35 @@ Parameters:
  */
 FOUNDATION_EXPORT BindingsGroupChat* _Nullable BindingsNewGroupChat(long e2eID, id<BindingsGroupRequest> _Nullable requestFunc, id<BindingsGroupChatProcessor> _Nullable processor, NSError* _Nullable* _Nullable error);
 
+/**
+ * NewOrLoadUd loads an existing Manager from storage or creates a
+new one if there is no extant storage information. Parameters need be provided
+to specify how to connect to the User Discovery service. These parameters may be used
+to contact either the UD server hosted by the xx network team or a custom
+third-party operated server. For the former, all the information may be pulled from the
+NDF using the bindings.
+
+Params
+ - e2eID - e2e object ID in the tracker
+ - follower - network follower func wrapped in UdNetworkStatus
+ - username - the username the user wants to register with UD.
+   If the user is already registered, this field may be blank
+ - networkValidationSig is a signature provided by the network (i.e. the client registrar).
+   This may be nil, however UD may return an error in some cases (e.g. in a production level
+   environment).
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+
+Returns
+ - A Manager object which is registered to the specified UD service.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewOrLoadUd(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
+
 /**
  * NewUdManagerFromBackup builds a new user discover manager from a backup. It
 will construct a manager that is already registered and restore already
@@ -1899,8 +1918,15 @@ Parameters:
  - follower - network follower func wrapped in UdNetworkStatus
  - emailFactJson - nullable JSON marshalled email fact.Fact
  - phoneFactJson - nullable JSON marshalled phone fact.Fact
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSError* _Nullable* _Nullable error);
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
 
 /**
  * RegisterLogWriter registers a callback on which logs are written.
diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings
index abf4d8981a3a5fba3a919da91f3d5fcc55f31dfa..ebf7d9f8c3a77aa7de06439f7c83a7e8d4d5a691 100644
Binary files a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Bindings differ
diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h
index 525c5d58f7977f0c8be4a79a023d321675f37b10..2acd7d58607297732a3a8fcb3cb8048738342fa0 100644
--- a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h
+++ b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/A/Headers/Bindings.objc.h
@@ -767,6 +767,22 @@ Returns:
  - []byte - the marshalled bytes of the id.ID object.
  */
 - (NSData* _Nullable)getReceptionID;
+/**
+ * GetUdAddressFromNdf retrieve the User Discovery's network address fom the NDF.
+ */
+- (NSString* _Nonnull)getUdAddressFromNdf;
+/**
+ * GetUdCertFromNdf retrieves the User Discovery's TLS certificate from the NDF.
+ */
+- (NSData* _Nullable)getUdCertFromNdf;
+/**
+ * GetUdContactFromNdf assembles the User Discovery's contact file from the data
+within the NDF.
+
+Returns
+ - []byte - A byte marshalled contact.Contact.
+ */
+- (NSData* _Nullable)getUdContactFromNdf:(NSError* _Nullable* _Nullable)error;
 /**
  * HasAuthenticatedChannel returns true if an authenticated channel with the
 partner exists, otherwise returns false.
@@ -1579,19 +1595,6 @@ Parameters:
  - factJson - a JSON marshalled fact.Fact
  */
 - (NSString* _Nonnull)sendRegisterFact:(NSData* _Nullable)factJson error:(NSError* _Nullable* _Nullable)error;
-/**
- * SetAlternativeUserDiscovery sets the alternativeUd object within manager.
-Once set, any user discovery operation will go through the alternative
-user discovery service.
-
-To undo this operation, use UnsetAlternativeUserDiscovery.
- */
-- (BOOL)setAlternativeUserDiscovery:(NSData* _Nullable)altCert altAddress:(NSData* _Nullable)altAddress contactFile:(NSData* _Nullable)contactFile error:(NSError* _Nullable* _Nullable)error;
-/**
- * UnsetAlternativeUserDiscovery clears out the information from the Manager
-object.
- */
-- (BOOL)unsetAlternativeUserDiscovery:(NSError* _Nullable* _Nullable)error;
 @end
 
 /**
@@ -1773,19 +1776,6 @@ subprocesses to perform network operations.
  */
 FOUNDATION_EXPORT BindingsCmix* _Nullable BindingsLoadCmix(NSString* _Nullable storageDir, NSData* _Nullable password, NSData* _Nullable cmixParamsJSON, NSError* _Nullable* _Nullable error);
 
-/**
- * LoadOrNewUserDiscovery creates a bindings-level user discovery manager.
-
-Parameters:
- - e2eID - e2e object ID in the tracker
- - follower - network follower func wrapped in UdNetworkStatus
- - username - the username the user wants to register with UD.
-   If the user is already registered, this field may be blank
- - registrationValidationSignature - the signature provided by the xx network.
-   This signature is optional for other consumers who deploy their own UD.
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsLoadOrNewUserDiscovery(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSError* _Nullable* _Nullable error);
-
 /**
  * LoadReceptionIdentity loads the given identity in Cmix storage with the given
 key.
@@ -1889,6 +1879,35 @@ Parameters:
  */
 FOUNDATION_EXPORT BindingsGroupChat* _Nullable BindingsNewGroupChat(long e2eID, id<BindingsGroupRequest> _Nullable requestFunc, id<BindingsGroupChatProcessor> _Nullable processor, NSError* _Nullable* _Nullable error);
 
+/**
+ * NewOrLoadUd loads an existing Manager from storage or creates a
+new one if there is no extant storage information. Parameters need be provided
+to specify how to connect to the User Discovery service. These parameters may be used
+to contact either the UD server hosted by the xx network team or a custom
+third-party operated server. For the former, all the information may be pulled from the
+NDF using the bindings.
+
+Params
+ - e2eID - e2e object ID in the tracker
+ - follower - network follower func wrapped in UdNetworkStatus
+ - username - the username the user wants to register with UD.
+   If the user is already registered, this field may be blank
+ - networkValidationSig is a signature provided by the network (i.e. the client registrar).
+   This may be nil, however UD may return an error in some cases (e.g. in a production level
+   environment).
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+
+Returns
+ - A Manager object which is registered to the specified UD service.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewOrLoadUd(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
+
 /**
  * NewUdManagerFromBackup builds a new user discover manager from a backup. It
 will construct a manager that is already registered and restore already
@@ -1899,8 +1918,15 @@ Parameters:
  - follower - network follower func wrapped in UdNetworkStatus
  - emailFactJson - nullable JSON marshalled email fact.Fact
  - phoneFactJson - nullable JSON marshalled phone fact.Fact
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSError* _Nullable* _Nullable error);
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
 
 /**
  * RegisterLogWriter registers a callback on which logs are written.
diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Bindings b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Bindings
index abf4d8981a3a5fba3a919da91f3d5fcc55f31dfa..ebf7d9f8c3a77aa7de06439f7c83a7e8d4d5a691 100644
Binary files a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Bindings differ
diff --git a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Headers/Bindings.objc.h
index 525c5d58f7977f0c8be4a79a023d321675f37b10..2acd7d58607297732a3a8fcb3cb8048738342fa0 100644
--- a/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Headers/Bindings.objc.h
+++ b/Frameworks/Bindings.xcframework/ios-arm64/Bindings.framework/Versions/Current/Headers/Bindings.objc.h
@@ -767,6 +767,22 @@ Returns:
  - []byte - the marshalled bytes of the id.ID object.
  */
 - (NSData* _Nullable)getReceptionID;
+/**
+ * GetUdAddressFromNdf retrieve the User Discovery's network address fom the NDF.
+ */
+- (NSString* _Nonnull)getUdAddressFromNdf;
+/**
+ * GetUdCertFromNdf retrieves the User Discovery's TLS certificate from the NDF.
+ */
+- (NSData* _Nullable)getUdCertFromNdf;
+/**
+ * GetUdContactFromNdf assembles the User Discovery's contact file from the data
+within the NDF.
+
+Returns
+ - []byte - A byte marshalled contact.Contact.
+ */
+- (NSData* _Nullable)getUdContactFromNdf:(NSError* _Nullable* _Nullable)error;
 /**
  * HasAuthenticatedChannel returns true if an authenticated channel with the
 partner exists, otherwise returns false.
@@ -1579,19 +1595,6 @@ Parameters:
  - factJson - a JSON marshalled fact.Fact
  */
 - (NSString* _Nonnull)sendRegisterFact:(NSData* _Nullable)factJson error:(NSError* _Nullable* _Nullable)error;
-/**
- * SetAlternativeUserDiscovery sets the alternativeUd object within manager.
-Once set, any user discovery operation will go through the alternative
-user discovery service.
-
-To undo this operation, use UnsetAlternativeUserDiscovery.
- */
-- (BOOL)setAlternativeUserDiscovery:(NSData* _Nullable)altCert altAddress:(NSData* _Nullable)altAddress contactFile:(NSData* _Nullable)contactFile error:(NSError* _Nullable* _Nullable)error;
-/**
- * UnsetAlternativeUserDiscovery clears out the information from the Manager
-object.
- */
-- (BOOL)unsetAlternativeUserDiscovery:(NSError* _Nullable* _Nullable)error;
 @end
 
 /**
@@ -1773,19 +1776,6 @@ subprocesses to perform network operations.
  */
 FOUNDATION_EXPORT BindingsCmix* _Nullable BindingsLoadCmix(NSString* _Nullable storageDir, NSData* _Nullable password, NSData* _Nullable cmixParamsJSON, NSError* _Nullable* _Nullable error);
 
-/**
- * LoadOrNewUserDiscovery creates a bindings-level user discovery manager.
-
-Parameters:
- - e2eID - e2e object ID in the tracker
- - follower - network follower func wrapped in UdNetworkStatus
- - username - the username the user wants to register with UD.
-   If the user is already registered, this field may be blank
- - registrationValidationSignature - the signature provided by the xx network.
-   This signature is optional for other consumers who deploy their own UD.
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsLoadOrNewUserDiscovery(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSError* _Nullable* _Nullable error);
-
 /**
  * LoadReceptionIdentity loads the given identity in Cmix storage with the given
 key.
@@ -1889,6 +1879,35 @@ Parameters:
  */
 FOUNDATION_EXPORT BindingsGroupChat* _Nullable BindingsNewGroupChat(long e2eID, id<BindingsGroupRequest> _Nullable requestFunc, id<BindingsGroupChatProcessor> _Nullable processor, NSError* _Nullable* _Nullable error);
 
+/**
+ * NewOrLoadUd loads an existing Manager from storage or creates a
+new one if there is no extant storage information. Parameters need be provided
+to specify how to connect to the User Discovery service. These parameters may be used
+to contact either the UD server hosted by the xx network team or a custom
+third-party operated server. For the former, all the information may be pulled from the
+NDF using the bindings.
+
+Params
+ - e2eID - e2e object ID in the tracker
+ - follower - network follower func wrapped in UdNetworkStatus
+ - username - the username the user wants to register with UD.
+   If the user is already registered, this field may be blank
+ - networkValidationSig is a signature provided by the network (i.e. the client registrar).
+   This may be nil, however UD may return an error in some cases (e.g. in a production level
+   environment).
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+
+Returns
+ - A Manager object which is registered to the specified UD service.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewOrLoadUd(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
+
 /**
  * NewUdManagerFromBackup builds a new user discover manager from a backup. It
 will construct a manager that is already registered and restore already
@@ -1899,8 +1918,15 @@ Parameters:
  - follower - network follower func wrapped in UdNetworkStatus
  - emailFactJson - nullable JSON marshalled email fact.Fact
  - phoneFactJson - nullable JSON marshalled phone fact.Fact
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSError* _Nullable* _Nullable error);
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
 
 /**
  * RegisterLogWriter registers a callback on which logs are written.
diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Bindings b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Bindings
index de3447dcf74c1b6a9083db4a3dfa65fd21b0bc59..dcd69badf94f937c976f62a4f47070085efb2a0c 100644
Binary files a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Bindings differ
diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Headers/Bindings.objc.h
index 525c5d58f7977f0c8be4a79a023d321675f37b10..2acd7d58607297732a3a8fcb3cb8048738342fa0 100644
--- a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Headers/Bindings.objc.h
+++ b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Headers/Bindings.objc.h
@@ -767,6 +767,22 @@ Returns:
  - []byte - the marshalled bytes of the id.ID object.
  */
 - (NSData* _Nullable)getReceptionID;
+/**
+ * GetUdAddressFromNdf retrieve the User Discovery's network address fom the NDF.
+ */
+- (NSString* _Nonnull)getUdAddressFromNdf;
+/**
+ * GetUdCertFromNdf retrieves the User Discovery's TLS certificate from the NDF.
+ */
+- (NSData* _Nullable)getUdCertFromNdf;
+/**
+ * GetUdContactFromNdf assembles the User Discovery's contact file from the data
+within the NDF.
+
+Returns
+ - []byte - A byte marshalled contact.Contact.
+ */
+- (NSData* _Nullable)getUdContactFromNdf:(NSError* _Nullable* _Nullable)error;
 /**
  * HasAuthenticatedChannel returns true if an authenticated channel with the
 partner exists, otherwise returns false.
@@ -1579,19 +1595,6 @@ Parameters:
  - factJson - a JSON marshalled fact.Fact
  */
 - (NSString* _Nonnull)sendRegisterFact:(NSData* _Nullable)factJson error:(NSError* _Nullable* _Nullable)error;
-/**
- * SetAlternativeUserDiscovery sets the alternativeUd object within manager.
-Once set, any user discovery operation will go through the alternative
-user discovery service.
-
-To undo this operation, use UnsetAlternativeUserDiscovery.
- */
-- (BOOL)setAlternativeUserDiscovery:(NSData* _Nullable)altCert altAddress:(NSData* _Nullable)altAddress contactFile:(NSData* _Nullable)contactFile error:(NSError* _Nullable* _Nullable)error;
-/**
- * UnsetAlternativeUserDiscovery clears out the information from the Manager
-object.
- */
-- (BOOL)unsetAlternativeUserDiscovery:(NSError* _Nullable* _Nullable)error;
 @end
 
 /**
@@ -1773,19 +1776,6 @@ subprocesses to perform network operations.
  */
 FOUNDATION_EXPORT BindingsCmix* _Nullable BindingsLoadCmix(NSString* _Nullable storageDir, NSData* _Nullable password, NSData* _Nullable cmixParamsJSON, NSError* _Nullable* _Nullable error);
 
-/**
- * LoadOrNewUserDiscovery creates a bindings-level user discovery manager.
-
-Parameters:
- - e2eID - e2e object ID in the tracker
- - follower - network follower func wrapped in UdNetworkStatus
- - username - the username the user wants to register with UD.
-   If the user is already registered, this field may be blank
- - registrationValidationSignature - the signature provided by the xx network.
-   This signature is optional for other consumers who deploy their own UD.
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsLoadOrNewUserDiscovery(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSError* _Nullable* _Nullable error);
-
 /**
  * LoadReceptionIdentity loads the given identity in Cmix storage with the given
 key.
@@ -1889,6 +1879,35 @@ Parameters:
  */
 FOUNDATION_EXPORT BindingsGroupChat* _Nullable BindingsNewGroupChat(long e2eID, id<BindingsGroupRequest> _Nullable requestFunc, id<BindingsGroupChatProcessor> _Nullable processor, NSError* _Nullable* _Nullable error);
 
+/**
+ * NewOrLoadUd loads an existing Manager from storage or creates a
+new one if there is no extant storage information. Parameters need be provided
+to specify how to connect to the User Discovery service. These parameters may be used
+to contact either the UD server hosted by the xx network team or a custom
+third-party operated server. For the former, all the information may be pulled from the
+NDF using the bindings.
+
+Params
+ - e2eID - e2e object ID in the tracker
+ - follower - network follower func wrapped in UdNetworkStatus
+ - username - the username the user wants to register with UD.
+   If the user is already registered, this field may be blank
+ - networkValidationSig is a signature provided by the network (i.e. the client registrar).
+   This may be nil, however UD may return an error in some cases (e.g. in a production level
+   environment).
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+
+Returns
+ - A Manager object which is registered to the specified UD service.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewOrLoadUd(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
+
 /**
  * NewUdManagerFromBackup builds a new user discover manager from a backup. It
 will construct a manager that is already registered and restore already
@@ -1899,8 +1918,15 @@ Parameters:
  - follower - network follower func wrapped in UdNetworkStatus
  - emailFactJson - nullable JSON marshalled email fact.Fact
  - phoneFactJson - nullable JSON marshalled phone fact.Fact
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSError* _Nullable* _Nullable error);
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
 
 /**
  * RegisterLogWriter registers a callback on which logs are written.
diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings
index de3447dcf74c1b6a9083db4a3dfa65fd21b0bc59..dcd69badf94f937c976f62a4f47070085efb2a0c 100644
Binary files a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Bindings differ
diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h
index 525c5d58f7977f0c8be4a79a023d321675f37b10..2acd7d58607297732a3a8fcb3cb8048738342fa0 100644
--- a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h
+++ b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/A/Headers/Bindings.objc.h
@@ -767,6 +767,22 @@ Returns:
  - []byte - the marshalled bytes of the id.ID object.
  */
 - (NSData* _Nullable)getReceptionID;
+/**
+ * GetUdAddressFromNdf retrieve the User Discovery's network address fom the NDF.
+ */
+- (NSString* _Nonnull)getUdAddressFromNdf;
+/**
+ * GetUdCertFromNdf retrieves the User Discovery's TLS certificate from the NDF.
+ */
+- (NSData* _Nullable)getUdCertFromNdf;
+/**
+ * GetUdContactFromNdf assembles the User Discovery's contact file from the data
+within the NDF.
+
+Returns
+ - []byte - A byte marshalled contact.Contact.
+ */
+- (NSData* _Nullable)getUdContactFromNdf:(NSError* _Nullable* _Nullable)error;
 /**
  * HasAuthenticatedChannel returns true if an authenticated channel with the
 partner exists, otherwise returns false.
@@ -1579,19 +1595,6 @@ Parameters:
  - factJson - a JSON marshalled fact.Fact
  */
 - (NSString* _Nonnull)sendRegisterFact:(NSData* _Nullable)factJson error:(NSError* _Nullable* _Nullable)error;
-/**
- * SetAlternativeUserDiscovery sets the alternativeUd object within manager.
-Once set, any user discovery operation will go through the alternative
-user discovery service.
-
-To undo this operation, use UnsetAlternativeUserDiscovery.
- */
-- (BOOL)setAlternativeUserDiscovery:(NSData* _Nullable)altCert altAddress:(NSData* _Nullable)altAddress contactFile:(NSData* _Nullable)contactFile error:(NSError* _Nullable* _Nullable)error;
-/**
- * UnsetAlternativeUserDiscovery clears out the information from the Manager
-object.
- */
-- (BOOL)unsetAlternativeUserDiscovery:(NSError* _Nullable* _Nullable)error;
 @end
 
 /**
@@ -1773,19 +1776,6 @@ subprocesses to perform network operations.
  */
 FOUNDATION_EXPORT BindingsCmix* _Nullable BindingsLoadCmix(NSString* _Nullable storageDir, NSData* _Nullable password, NSData* _Nullable cmixParamsJSON, NSError* _Nullable* _Nullable error);
 
-/**
- * LoadOrNewUserDiscovery creates a bindings-level user discovery manager.
-
-Parameters:
- - e2eID - e2e object ID in the tracker
- - follower - network follower func wrapped in UdNetworkStatus
- - username - the username the user wants to register with UD.
-   If the user is already registered, this field may be blank
- - registrationValidationSignature - the signature provided by the xx network.
-   This signature is optional for other consumers who deploy their own UD.
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsLoadOrNewUserDiscovery(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSError* _Nullable* _Nullable error);
-
 /**
  * LoadReceptionIdentity loads the given identity in Cmix storage with the given
 key.
@@ -1889,6 +1879,35 @@ Parameters:
  */
 FOUNDATION_EXPORT BindingsGroupChat* _Nullable BindingsNewGroupChat(long e2eID, id<BindingsGroupRequest> _Nullable requestFunc, id<BindingsGroupChatProcessor> _Nullable processor, NSError* _Nullable* _Nullable error);
 
+/**
+ * NewOrLoadUd loads an existing Manager from storage or creates a
+new one if there is no extant storage information. Parameters need be provided
+to specify how to connect to the User Discovery service. These parameters may be used
+to contact either the UD server hosted by the xx network team or a custom
+third-party operated server. For the former, all the information may be pulled from the
+NDF using the bindings.
+
+Params
+ - e2eID - e2e object ID in the tracker
+ - follower - network follower func wrapped in UdNetworkStatus
+ - username - the username the user wants to register with UD.
+   If the user is already registered, this field may be blank
+ - networkValidationSig is a signature provided by the network (i.e. the client registrar).
+   This may be nil, however UD may return an error in some cases (e.g. in a production level
+   environment).
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+
+Returns
+ - A Manager object which is registered to the specified UD service.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewOrLoadUd(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
+
 /**
  * NewUdManagerFromBackup builds a new user discover manager from a backup. It
 will construct a manager that is already registered and restore already
@@ -1899,8 +1918,15 @@ Parameters:
  - follower - network follower func wrapped in UdNetworkStatus
  - emailFactJson - nullable JSON marshalled email fact.Fact
  - phoneFactJson - nullable JSON marshalled phone fact.Fact
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSError* _Nullable* _Nullable error);
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
 
 /**
  * RegisterLogWriter registers a callback on which logs are written.
diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Bindings b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Bindings
index de3447dcf74c1b6a9083db4a3dfa65fd21b0bc59..dcd69badf94f937c976f62a4f47070085efb2a0c 100644
Binary files a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Bindings and b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Bindings differ
diff --git a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Headers/Bindings.objc.h b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Headers/Bindings.objc.h
index 525c5d58f7977f0c8be4a79a023d321675f37b10..2acd7d58607297732a3a8fcb3cb8048738342fa0 100644
--- a/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Headers/Bindings.objc.h
+++ b/Frameworks/Bindings.xcframework/ios-arm64_x86_64-simulator/Bindings.framework/Versions/Current/Headers/Bindings.objc.h
@@ -767,6 +767,22 @@ Returns:
  - []byte - the marshalled bytes of the id.ID object.
  */
 - (NSData* _Nullable)getReceptionID;
+/**
+ * GetUdAddressFromNdf retrieve the User Discovery's network address fom the NDF.
+ */
+- (NSString* _Nonnull)getUdAddressFromNdf;
+/**
+ * GetUdCertFromNdf retrieves the User Discovery's TLS certificate from the NDF.
+ */
+- (NSData* _Nullable)getUdCertFromNdf;
+/**
+ * GetUdContactFromNdf assembles the User Discovery's contact file from the data
+within the NDF.
+
+Returns
+ - []byte - A byte marshalled contact.Contact.
+ */
+- (NSData* _Nullable)getUdContactFromNdf:(NSError* _Nullable* _Nullable)error;
 /**
  * HasAuthenticatedChannel returns true if an authenticated channel with the
 partner exists, otherwise returns false.
@@ -1579,19 +1595,6 @@ Parameters:
  - factJson - a JSON marshalled fact.Fact
  */
 - (NSString* _Nonnull)sendRegisterFact:(NSData* _Nullable)factJson error:(NSError* _Nullable* _Nullable)error;
-/**
- * SetAlternativeUserDiscovery sets the alternativeUd object within manager.
-Once set, any user discovery operation will go through the alternative
-user discovery service.
-
-To undo this operation, use UnsetAlternativeUserDiscovery.
- */
-- (BOOL)setAlternativeUserDiscovery:(NSData* _Nullable)altCert altAddress:(NSData* _Nullable)altAddress contactFile:(NSData* _Nullable)contactFile error:(NSError* _Nullable* _Nullable)error;
-/**
- * UnsetAlternativeUserDiscovery clears out the information from the Manager
-object.
- */
-- (BOOL)unsetAlternativeUserDiscovery:(NSError* _Nullable* _Nullable)error;
 @end
 
 /**
@@ -1773,19 +1776,6 @@ subprocesses to perform network operations.
  */
 FOUNDATION_EXPORT BindingsCmix* _Nullable BindingsLoadCmix(NSString* _Nullable storageDir, NSData* _Nullable password, NSData* _Nullable cmixParamsJSON, NSError* _Nullable* _Nullable error);
 
-/**
- * LoadOrNewUserDiscovery creates a bindings-level user discovery manager.
-
-Parameters:
- - e2eID - e2e object ID in the tracker
- - follower - network follower func wrapped in UdNetworkStatus
- - username - the username the user wants to register with UD.
-   If the user is already registered, this field may be blank
- - registrationValidationSignature - the signature provided by the xx network.
-   This signature is optional for other consumers who deploy their own UD.
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsLoadOrNewUserDiscovery(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSError* _Nullable* _Nullable error);
-
 /**
  * LoadReceptionIdentity loads the given identity in Cmix storage with the given
 key.
@@ -1889,6 +1879,35 @@ Parameters:
  */
 FOUNDATION_EXPORT BindingsGroupChat* _Nullable BindingsNewGroupChat(long e2eID, id<BindingsGroupRequest> _Nullable requestFunc, id<BindingsGroupChatProcessor> _Nullable processor, NSError* _Nullable* _Nullable error);
 
+/**
+ * NewOrLoadUd loads an existing Manager from storage or creates a
+new one if there is no extant storage information. Parameters need be provided
+to specify how to connect to the User Discovery service. These parameters may be used
+to contact either the UD server hosted by the xx network team or a custom
+third-party operated server. For the former, all the information may be pulled from the
+NDF using the bindings.
+
+Params
+ - e2eID - e2e object ID in the tracker
+ - follower - network follower func wrapped in UdNetworkStatus
+ - username - the username the user wants to register with UD.
+   If the user is already registered, this field may be blank
+ - networkValidationSig is a signature provided by the network (i.e. the client registrar).
+   This may be nil, however UD may return an error in some cases (e.g. in a production level
+   environment).
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+
+Returns
+ - A Manager object which is registered to the specified UD service.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewOrLoadUd(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSString* _Nullable username, NSData* _Nullable registrationValidationSignature, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
+
 /**
  * NewUdManagerFromBackup builds a new user discover manager from a backup. It
 will construct a manager that is already registered and restore already
@@ -1899,8 +1918,15 @@ Parameters:
  - follower - network follower func wrapped in UdNetworkStatus
  - emailFactJson - nullable JSON marshalled email fact.Fact
  - phoneFactJson - nullable JSON marshalled phone fact.Fact
- */
-FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSError* _Nullable* _Nullable error);
+ - cert is the TLS certificate for the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdCertFromNdf.
+ - contactFile is the data within a marshalled contact.Contact. This represents the
+   contact file of the server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdContactFromNdf.
+ - address is the IP address of the UD server this call will connect with.
+   You may use the UD server run by the xx network team by using E2e.GetUdAddressFromNdf.
+ */
+FOUNDATION_EXPORT BindingsUserDiscovery* _Nullable BindingsNewUdManagerFromBackup(long e2eID, id<BindingsUdNetworkStatus> _Nullable follower, NSData* _Nullable emailFactJson, NSData* _Nullable phoneFactJson, NSData* _Nullable cert, NSData* _Nullable contactFile, NSString* _Nullable address, NSError* _Nullable* _Nullable error);
 
 /**
  * RegisterLogWriter registers a callback on which logs are written.
diff --git a/Sources/ElixxirDAppsSDK/E2E/E2E.swift b/Sources/ElixxirDAppsSDK/E2E/E2E.swift
index 710de98e414642b0638105e5520be63303ba3a36..608ccc6e3703e8818fff89705d5e822fae758916 100644
--- a/Sources/ElixxirDAppsSDK/E2E/E2E.swift
+++ b/Sources/ElixxirDAppsSDK/E2E/E2E.swift
@@ -7,6 +7,9 @@ public struct E2E {
   public var getHistoricalDHPublicKey: E2EGetHistoricalDHPublicKey
   public var getContact: E2EGetContact
   public var getAllPartnerIds: E2EGetAllPartnerIds
+  public var getUdAddressFromNdf: E2EGetUdAddressFromNdf
+  public var getUdCertFromNdf: E2EGetUdCertFromNdf
+  public var getUdContactFromNdf: E2EGetUdContactFromNdf
   public var payloadSize: E2EPayloadSize
   public var partitionSize: E2EPartitionSize
   public var addPartnerCallback: E2EAddPartnerCallback
@@ -34,6 +37,9 @@ extension E2E {
       getHistoricalDHPublicKey: .live(bindingsE2E),
       getContact: .live(bindingsE2E),
       getAllPartnerIds: .live(bindingsE2E),
+      getUdAddressFromNdf: .live(bindingsE2E),
+      getUdCertFromNdf: .live(bindingsE2E),
+      getUdContactFromNdf: .live(bindingsE2E),
       payloadSize: .live(bindingsE2E),
       partitionSize: .live(bindingsE2E),
       addPartnerCallback: .live(bindingsE2E),
@@ -62,6 +68,9 @@ extension E2E {
     getHistoricalDHPublicKey: .unimplemented,
     getContact: .unimplemented,
     getAllPartnerIds: .unimplemented,
+    getUdAddressFromNdf: .unimplemented,
+    getUdCertFromNdf: .unimplemented,
+    getUdContactFromNdf: .unimplemented,
     payloadSize: .unimplemented,
     partitionSize: .unimplemented,
     addPartnerCallback: .unimplemented,
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdAddressFromNdf.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdAddressFromNdf.swift
new file mode 100644
index 0000000000000000000000000000000000000000..4899063829c7aeaa6be31642dfbc2cb8358c2b93
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdAddressFromNdf.swift
@@ -0,0 +1,22 @@
+import Bindings
+import XCTestDynamicOverlay
+
+public struct E2EGetUdAddressFromNdf {
+  public var run: () -> String
+
+  public func callAsFunction() -> String {
+    run()
+  }
+}
+
+extension E2EGetUdAddressFromNdf {
+  public static func live(_ bindingsE2E: BindingsE2e) -> E2EGetUdAddressFromNdf {
+    E2EGetUdAddressFromNdf(run: bindingsE2E.getUdAddressFromNdf)
+  }
+}
+
+extension E2EGetUdAddressFromNdf {
+  public static let unimplemented = E2EGetUdAddressFromNdf(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdCertFromNdf.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdCertFromNdf.swift
new file mode 100644
index 0000000000000000000000000000000000000000..ce322dab4c26428482ca7a838e99c0d0e94e3883
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdCertFromNdf.swift
@@ -0,0 +1,27 @@
+import Bindings
+import XCTestDynamicOverlay
+
+public struct E2EGetUdCertFromNdf {
+  public var run: () -> Data
+
+  public func callAsFunction() -> Data {
+    run()
+  }
+}
+
+extension E2EGetUdCertFromNdf {
+  public static func live(_ bindingsE2E: BindingsE2e) -> E2EGetUdCertFromNdf {
+    E2EGetUdCertFromNdf {
+      guard let data = bindingsE2E.getUdCertFromNdf() else {
+        fatalError("BindingsE2e.getUdCertFromNdf returned `nil`")
+      }
+      return data
+    }
+  }
+}
+
+extension E2EGetUdCertFromNdf {
+  public static let unimplemented = E2EGetUdCertFromNdf(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}
diff --git a/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdContactFromNdf.swift b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdContactFromNdf.swift
new file mode 100644
index 0000000000000000000000000000000000000000..eb3e91e35c1ce531c05e23f7559ecd2efd3976e6
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/E2E/Functors/E2EGetUdContactFromNdf.swift
@@ -0,0 +1,22 @@
+import Bindings
+import XCTestDynamicOverlay
+
+public struct E2EGetUdContactFromNdf {
+  public var run: () throws -> Data
+
+  public func callAsFunction() throws -> Data {
+    try run()
+  }
+}
+
+extension E2EGetUdContactFromNdf {
+  public static func live(_ bindingsE2E: BindingsE2e) -> E2EGetUdContactFromNdf {
+    E2EGetUdContactFromNdf(run: bindingsE2E.getUdContactFromNdf)
+  }
+}
+
+extension E2EGetUdContactFromNdf {
+  public static let unimplemented = E2EGetUdContactFromNdf(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}
diff --git a/Sources/ElixxirDAppsSDK/Functors/LoadOrNewUserDiscovery.swift b/Sources/ElixxirDAppsSDK/Functors/LoadOrNewUserDiscovery.swift
deleted file mode 100644
index 95a7371a0321974e1282fb99acb3137bc3fa4139..0000000000000000000000000000000000000000
--- a/Sources/ElixxirDAppsSDK/Functors/LoadOrNewUserDiscovery.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-import Bindings
-import XCTestDynamicOverlay
-
-public struct LoadOrNewUserDiscovery {
-  public var run: (Int, UdNetworkStatus, String?, Data?) throws -> UserDiscovery
-
-  public func callAsFunction(
-    e2eId: Int,
-    follower: UdNetworkStatus,
-    username: String?,
-    registrationValidationSignature: Data?
-  ) throws -> UserDiscovery {
-    try run(e2eId, follower, username, registrationValidationSignature)
-  }
-}
-
-extension LoadOrNewUserDiscovery {
-  public static let live = LoadOrNewUserDiscovery {
-    e2eId, follower, username, registrationValidationSignature in
-
-    var error: NSError?
-    let bindingsUD = BindingsLoadOrNewUserDiscovery(
-      e2eId,
-      follower.makeBindingsUdNetworkStatus(),
-      username,
-      registrationValidationSignature,
-      &error
-    )
-    if let error = error {
-      throw error
-    }
-    guard let bindingsUD = bindingsUD else {
-      fatalError("BindingsLoadOrNewUserDiscovery returned `nil` without providing error")
-    }
-    return .live(bindingsUD)
-  }
-}
-
-extension LoadOrNewUserDiscovery {
-  public static let unimplemented = LoadOrNewUserDiscovery(
-    run: XCTUnimplemented("\(Self.self)")
-  )
-}
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewOrLoadUd.swift b/Sources/ElixxirDAppsSDK/Functors/NewOrLoadUd.swift
new file mode 100644
index 0000000000000000000000000000000000000000..3b1599751d57555cbf2b419e37e1d368834c1884
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/Functors/NewOrLoadUd.swift
@@ -0,0 +1,67 @@
+import Bindings
+import XCTestDynamicOverlay
+
+public struct NewOrLoadUd {
+  public struct Params {
+    public init(
+      e2eId: Int,
+      follower: UdNetworkStatus,
+      username: String?,
+      registrationValidationSignature: Data?,
+      cert: Data,
+      contactFile: Data,
+      address: String
+    ) {
+      self.e2eId = e2eId
+      self.follower = follower
+      self.username = username
+      self.registrationValidationSignature = registrationValidationSignature
+      self.cert = cert
+      self.contactFile = contactFile
+      self.address = address
+    }
+
+    public var e2eId: Int
+    public var follower: UdNetworkStatus
+    public var username: String?
+    public var registrationValidationSignature: Data?
+    public var cert: Data
+    public var contactFile: Data
+    public var address: String
+  }
+
+  public var run: (Params) throws -> UserDiscovery
+
+  public func callAsFunction(_ params: Params) throws -> UserDiscovery {
+    try run(params)
+  }
+}
+
+extension NewOrLoadUd {
+  public static let live = NewOrLoadUd { params in
+    var error: NSError?
+    let bindingsUD = BindingsNewOrLoadUd(
+      params.e2eId,
+      params.follower.makeBindingsUdNetworkStatus(),
+      params.username,
+      params.registrationValidationSignature,
+      params.cert,
+      params.contactFile,
+      params.address,
+      &error
+    )
+    if let error = error {
+      throw error
+    }
+    guard let bindingsUD = bindingsUD else {
+      fatalError("BindingsNewOrLoadUd returned `nil` without providing error")
+    }
+    return .live(bindingsUD)
+  }
+}
+
+extension NewOrLoadUd {
+  public static let unimplemented = NewOrLoadUd(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}
diff --git a/Sources/ElixxirDAppsSDK/Functors/NewUdManagerFromBackup.swift b/Sources/ElixxirDAppsSDK/Functors/NewUdManagerFromBackup.swift
index 8c57aa35d51eef3664db8ea1f3974d536d5a9c99..09dbf72ecd665e1eb391ecc8f88b8c1be5d5d4ec 100644
--- a/Sources/ElixxirDAppsSDK/Functors/NewUdManagerFromBackup.swift
+++ b/Sources/ElixxirDAppsSDK/Functors/NewUdManagerFromBackup.swift
@@ -2,28 +2,52 @@ import Bindings
 import XCTestDynamicOverlay
 
 public struct NewUdManagerFromBackup {
-  public var run: (Int, UdNetworkStatus, Fact?, Fact?) throws -> UserDiscovery
+  public struct Params {
+    public init(
+      e2eId: Int,
+      follower: UdNetworkStatus,
+      email: Fact?,
+      phone: Fact?,
+      cert: Data,
+      contactFile: Data,
+      address: String
+    ) {
+      self.e2eId = e2eId
+      self.follower = follower
+      self.email = email
+      self.phone = phone
+      self.cert = cert
+      self.contactFile = contactFile
+      self.address = address
+    }
 
-  public func callAsFunction(
-    e2eId: Int,
-    follower: UdNetworkStatus,
-    email: Fact?,
-    phone: Fact?
-  ) throws -> UserDiscovery {
-    try run(e2eId, follower, email, phone)
+    public var e2eId: Int
+    public var follower: UdNetworkStatus
+    public var email: Fact?
+    public var phone: Fact?
+    public var cert: Data
+    public var contactFile: Data
+    public var address: String
+  }
+
+  public var run: (Params) throws -> UserDiscovery
+
+  public func callAsFunction(_ params: Params) throws -> UserDiscovery {
+    try run(params)
   }
 }
 
 extension NewUdManagerFromBackup {
-  public static let live = NewUdManagerFromBackup {
-    e2eId, follower, email, phone in
-
+  public static let live = NewUdManagerFromBackup { params in
     var error: NSError?
     let bindingsUD = BindingsNewUdManagerFromBackup(
-      e2eId,
-      follower.makeBindingsUdNetworkStatus(),
-      try email?.encode(),
-      try phone?.encode(),
+      params.e2eId,
+      params.follower.makeBindingsUdNetworkStatus(),
+      try params.email?.encode(),
+      try params.phone?.encode(),
+      params.cert,
+      params.contactFile,
+      params.address,
       &error
     )
     if let error = error {
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoverySetAlternative.swift b/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoverySetAlternative.swift
deleted file mode 100644
index 731518eb8868f40d77639e55306e345d8a79be36..0000000000000000000000000000000000000000
--- a/Sources/ElixxirDAppsSDK/UserDiscovery/Functors/UserDiscoverySetAlternative.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-import Bindings
-import XCTestDynamicOverlay
-
-public struct UserDiscoverySetAlternative {
-  public var run: (UserDiscoveryConfig?) throws -> Void
-
-  public func callAsFunction(_ config: UserDiscoveryConfig?) throws {
-    try run(config)
-  }
-}
-
-extension UserDiscoverySetAlternative {
-  public static func live(_ bindingsUD: BindingsUserDiscovery) -> UserDiscoverySetAlternative {
-    UserDiscoverySetAlternative { config in
-      if let config = config {
-        try bindingsUD.setAlternative(
-          config.cert,
-          altAddress: config.address,
-          contactFile: config.contact
-        )
-      } else {
-        try bindingsUD.unsetAlternativeUserDiscovery()
-      }
-    }
-  }
-}
-
-extension UserDiscoverySetAlternative {
-  public static let unimplemented = UserDiscoverySetAlternative(
-    run: XCTUnimplemented("\(Self.self)")
-  )
-}
-
diff --git a/Sources/ElixxirDAppsSDK/UserDiscovery/UserDiscovery.swift b/Sources/ElixxirDAppsSDK/UserDiscovery/UserDiscovery.swift
index a0935d810b19e6145274edd6d301901ceb36e31c..75c018ebddb4ea884fc073903c7a7fb7781c1670 100644
--- a/Sources/ElixxirDAppsSDK/UserDiscovery/UserDiscovery.swift
+++ b/Sources/ElixxirDAppsSDK/UserDiscovery/UserDiscovery.swift
@@ -1,7 +1,6 @@
 import Bindings
 
 public struct UserDiscovery {
-  public var setAlternative: UserDiscoverySetAlternative
   public var getId: UserDiscoveryGetId
   public var getContact: UserDiscoveryGetContact
   public var getFacts: UserDiscoveryGetFacts
@@ -14,7 +13,6 @@ public struct UserDiscovery {
 extension UserDiscovery {
   public static func live(_ bindingsUD: BindingsUserDiscovery) -> UserDiscovery {
     UserDiscovery(
-      setAlternative: .live(bindingsUD),
       getId: .live(bindingsUD),
       getContact: .live(bindingsUD),
       getFacts: .live(bindingsUD),
@@ -28,7 +26,6 @@ extension UserDiscovery {
 
 extension UserDiscovery {
   public static let unimplemented = UserDiscovery(
-    setAlternative: .unimplemented,
     getId: .unimplemented,
     getContact: .unimplemented,
     getFacts: .unimplemented,