diff --git a/pairing-crypto.podspec b/pairing-crypto.podspec
index 86e795eb..dec844fb 100644
--- a/pairing-crypto.podspec
+++ b/pairing-crypto.podspec
@@ -6,20 +6,12 @@ Pod::Spec.new do |s|
   s.license      = "Apache-2.0"
   s.authors      = "MATTR Team"
 
-  s.platforms    = { :ios => "9.0" }
+  s.platforms    = { :ios => "12.0" }
   s.source       = { :git => "https://github.com/mattrglobal/pairing_crypto.git", :tag => "#{s.version}" }
 
   # TODO: The external libraries must be commited to the repo when we decided to publish this pod.
-  s.vendored_libraries = 'wrappers/obj-c/libraries/libpairing_crypto_c.a'
-  s.source_files = 'wrappers/obj-c/pairing_crypto/*.{h,m,mm}'
-  s.requires_arc = true
-
-  s.pod_target_xcconfig = {
-    'VALID_ARCHS' => 'arm64 x86_64',
-    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => "arm64",
-    "HEADER_SEARCH_PATHS" => "$(CONFIGURATION_BUILD_DIR)",
-    "ENABLE_BITCODE" => "YES"
-  }
+  s.vendored_frameworks = 'libpairing_crypto_c.xcframework'
+  s.source_files = 'wrappers/obj-c/pairing_crypto/*.{h,m,mm}', 'libpairing_crypto_c.xcframework'
 
   s.test_spec 'Tests' do |test_spec|
     test_spec.source_files = 'wrappers/obj-c/tests/**/*.{h,m}'
diff --git a/src/common/key_pair.rs b/src/common/key_pair.rs
index 0f68cb8b..67ad4401 100644
--- a/src/common/key_pair.rs
+++ b/src/common/key_pair.rs
@@ -100,7 +100,7 @@ macro_rules! bbs_bls_key_pair_impl {
 
             /// Convert a vector of bytes of big-endian representation of the
             /// secret key.
-            pub fn from_vec(bytes: &Vec<u8>) -> Result<Self, Error> {
+            pub fn from_vec(bytes: &[u8]) -> Result<Self, Error> {
                 match vec_to_byte_array::<{ Self::SIZE_BYTES }>(bytes) {
                     Ok(result) => Self::from_bytes(&result),
                     Err(e) => Err(e),
@@ -195,7 +195,7 @@ macro_rules! bbs_bls_key_pair_impl {
 
             /// Convert a vector of bytes of big-endian representation of the
             /// public key.
-            pub fn from_vec(bytes: &Vec<u8>) -> Result<Self, Error> {
+            pub fn from_vec(bytes: &[u8]) -> Result<Self, Error> {
                 match vec_to_byte_array::<{ Self::SIZE_BYTES }>(bytes) {
                     Ok(result) => Self::from_octets(&result),
                     Err(e) => Err(e),
diff --git a/src/common/util.rs b/src/common/util.rs
index 0b44d85f..c97aaa71 100644
--- a/src/common/util.rs
+++ b/src/common/util.rs
@@ -14,11 +14,9 @@ macro_rules! print_byte_array {
 
 pub(crate) use print_byte_array;
 
-pub fn vec_to_byte_array<const N: usize>(
-    vec: &Vec<u8>,
-) -> Result<[u8; N], Error> {
+pub fn vec_to_byte_array<const N: usize>(vec: &[u8]) -> Result<[u8; N], Error> {
     let data_len = vec.len();
-    match <[u8; N]>::try_from(vec.clone()) {
+    match <[u8; N]>::try_from(vec.to_owned()) {
         Ok(result) => Ok(result),
         Err(_) => Err(Error::Conversion {
             cause: format!(
diff --git a/src/curves/bls12_381.rs b/src/curves/bls12_381.rs
index f242738b..6c423515 100644
--- a/src/curves/bls12_381.rs
+++ b/src/curves/bls12_381.rs
@@ -1,4 +1,4 @@
-pub use blstrs::{Bls12 as pairing_engine, *};
+pub use blstrs::*;
 
 /// Number of bytes to store a scalar.
 pub(crate) const OCTET_SCALAR_LENGTH: usize = 32;
diff --git a/src/schemes/bbs/core/proof.rs b/src/schemes/bbs/core/proof.rs
index 374eaa6c..c6d7b48a 100644
--- a/src/schemes/bbs/core/proof.rs
+++ b/src/schemes/bbs/core/proof.rs
@@ -444,14 +444,14 @@ impl Proof {
     /// Get the proof `Proof` from a sequence of bytes in big endian format.
     /// This method implements `OctetsToProof` API as defined in BBS specification <https://identity.foundation/bbs-signature/draft-bbs-signatures.html#name-octetstoproof>.
     /// Each member of `Proof` is deserialized from big-endian bytes.
-    /// Expected input size is `OCTET_POINT_G1_LENGTH * 3 + OCTET_SCALAR_LENGTH
-    /// * (5 + U)` where `OCTET_POINT_G1_LENGTH`, size of a point in `G1` in
-    ///   ompressed form, `OCTET_SCALAR_LENGTH`, size of a `Scalar`, and `U` is
-    ///   the number of hidden messages.
-    /// For BLS12-381 based implementation, OCTET_POINT_G1_LENGTH is 48 byes,
-    /// and OCTET_SCALAR_LENGTH is 32 bytes, then bytes sequence will be
-    /// treated as [48, 48, 32, 32, 32, 32*U ] to represent   
-    /// proof = (Abar, Bbar, c, r2^, z^, (m^_1, ..., m^_U)).
+    /// Expected input size is
+    /// `OCTET_POINT_G1_LENGTH * 3 + OCTET_SCALAR_LENGTH * (5 + U)`
+    /// where `OCTET_POINT_G1_LENGTH`, size of a point in `G1` in
+    /// compressed form, `OCTET_SCALAR_LENGTH`, size of a `Scalar`, and `U` is
+    /// the number of hidden messages. For BLS12-381 based implementation,
+    /// OCTET_POINT_G1_LENGTH is 48 byes, and OCTET_SCALAR_LENGTH is 32 bytes,
+    /// then bytes sequence will be treated as [48, 48, 32, 32, 32, 32*U ] to
+    /// represent proof = (Abar, Bbar, c, r2^, z^, (m^_1, ..., m^_U)).
     pub fn from_octets<B: AsRef<[u8]>>(bytes: B) -> Result<Self, Error> {
         const PROOF_LEN_FLOOR: usize =
             OCTET_POINT_G1_LENGTH * 2 + OCTET_SCALAR_LENGTH * 3;
diff --git a/src/schemes/bls/ciphersuites.rs b/src/schemes/bls/ciphersuites.rs
index 1491ab3d..501bb2fa 100644
--- a/src/schemes/bls/ciphersuites.rs
+++ b/src/schemes/bls/ciphersuites.rs
@@ -1,6 +1,6 @@
 use crate::{
     common::hash_param::h2c::HashToCurveParameter,
-    curves::bls12_381::{G1Projective, G2Projective},
+    curves::bls12_381::G1Projective,
 };
 use group::Group;
 
@@ -20,11 +20,6 @@ pub(crate) trait BlsCiphersuiteParameters: HashToCurveParameter {
     fn p1() -> G1Projective {
         G1Projective::generator()
     }
-
-    /// Point on G2 to be used during signature and proof verification.
-    fn p2() -> G2Projective {
-        G2Projective::generator()
-    }
 }
 
 pub(crate) trait BlsSigAugCiphersuiteParameters:
diff --git a/tools/bbs-fixtures-generator/src/generators/h2s.rs b/tools/bbs-fixtures-generator/src/generators/h2s.rs
index bb450d4d..23ff3d7e 100644
--- a/tools/bbs-fixtures-generator/src/generators/h2s.rs
+++ b/tools/bbs-fixtures-generator/src/generators/h2s.rs
@@ -34,7 +34,7 @@ use blstrs::{
 use rand::RngCore;
 use sha2::Sha256;
 use sha3::Shake256;
-use std::path::PathBuf;
+use std::path::Path;
 
 macro_rules! generate_hash_fixtures {
     ($hash_to_scalar_fn:ident,
@@ -131,7 +131,7 @@ macro_rules! generate_mocked_rnd_scalars_fixtures {
     }};
 }
 
-pub fn generate(fixture_gen_input: &FixtureGenInput, output_dir: &PathBuf) {
+pub fn generate(fixture_gen_input: &FixtureGenInput, output_dir: &Path) {
     generate_hash_fixtures!(
         bls12_381_shake_256_h2s,
         bls12_381_shake_256_default_hash_to_scalar_dst,
diff --git a/tools/bbs-fixtures-generator/src/generators/mod.rs b/tools/bbs-fixtures-generator/src/generators/mod.rs
index 57d3b1cc..86ae43ac 100644
--- a/tools/bbs-fixtures-generator/src/generators/mod.rs
+++ b/tools/bbs-fixtures-generator/src/generators/mod.rs
@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::Path;
 
 use crate::model::FixtureGenInput;
 
@@ -12,7 +12,7 @@ pub const PROOF_FIXTURES_SUBDIR: &str = "proof";
 
 pub fn generate_fixtures(
     fixture_gen_input: &FixtureGenInput,
-    fixture_output_dir: &PathBuf,
+    fixture_output_dir: &Path,
 ) {
     signature::generate(fixture_gen_input, fixture_output_dir);
 
diff --git a/wrappers/c/scripts/build-platform-targets.sh b/wrappers/c/scripts/build-platform-targets.sh
index 711fb338..1d9f4142 100755
--- a/wrappers/c/scripts/build-platform-targets.sh
+++ b/wrappers/c/scripts/build-platform-targets.sh
@@ -41,18 +41,23 @@ case $PLATFORM in
       mkdir -p $OUTPUT_LOCATION/ios
 
       # Create the directories at the output location for the release binaries
-      mkdir -p $OUTPUT_LOCATION/ios/x86_64
+      mkdir -p $OUTPUT_LOCATION/ios/x86_64-sim
       mkdir -p $OUTPUT_LOCATION/ios/aarch64
-      mkdir -p $OUTPUT_LOCATION/ios/universal
+      mkdir -p $OUTPUT_LOCATION/ios/aarch64-sim
+      mkdir -p $OUTPUT_LOCATION/ios/universal-sim
 
       # Install cargo-lipo
       # see https://github.com/TimNN/cargo-lipo
       cargo install cargo-lipo
-      rustup target install x86_64-apple-ios aarch64-apple-ios
-      cargo lipo -p $PROJECT_NAME --release
-      cp "$ROOT_DIRECTORY/target/x86_64-apple-ios/release/$INPUT_FILE.a"  "$OUTPUT_LOCATION/ios/x86_64/$OUTPUT_FILE.a"
+      rustup target install x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim
+      # Build for 64 bit arm ios devices
+      cargo build -p $PROJECT_NAME --release --target aarch64-apple-ios
+      # Build for intel and arm desktop simulators
+      cargo lipo -p $PROJECT_NAME --release --targets x86_64-apple-ios,aarch64-apple-ios-sim
+      cp "$ROOT_DIRECTORY/target/x86_64-apple-ios/release/$INPUT_FILE.a"  "$OUTPUT_LOCATION/ios/x86_64-sim/$OUTPUT_FILE.a"
       cp "$ROOT_DIRECTORY/target/aarch64-apple-ios/release/$INPUT_FILE.a" "$OUTPUT_LOCATION/ios/aarch64/$OUTPUT_FILE.a"
-      cp "$ROOT_DIRECTORY/target/universal/release/$INPUT_FILE.a"         "$OUTPUT_LOCATION/ios/universal/$OUTPUT_FILE.a"
+      cp "$ROOT_DIRECTORY/target/aarch64-apple-ios-sim/release/$INPUT_FILE.a" "$OUTPUT_LOCATION/ios/aarch64-sim/$OUTPUT_FILE.a"
+      cp "$ROOT_DIRECTORY/target/universal/release/$INPUT_FILE.a"         "$OUTPUT_LOCATION/ios/universal-sim/$OUTPUT_FILE.a"
     ;;
     MACOS)
       # Create the root directory for the macos release binaries
diff --git a/wrappers/obj-c/pairing_crypto.xcodeproj/project.pbxproj b/wrappers/obj-c/pairing_crypto.xcodeproj/project.pbxproj
index 40f76d10..c0e04c6c 100644
--- a/wrappers/obj-c/pairing_crypto.xcodeproj/project.pbxproj
+++ b/wrappers/obj-c/pairing_crypto.xcodeproj/project.pbxproj
@@ -7,22 +7,33 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		63C101042C333032008BD650 /* bbs_bls12381_shake256_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100F82C333032008BD650 /* bbs_bls12381_shake256_proof.m */; };
+		63C101052C333032008BD650 /* bbs_bls12381_sha256_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100F02C333032008BD650 /* bbs_bls12381_sha256_key_pair.m */; };
+		63C101062C333032008BD650 /* bbs_bls12381_shake256_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100FA2C333032008BD650 /* bbs_bls12381_shake256_signature.m */; };
+		63C101072C333032008BD650 /* bbs_bls12381_sha256_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100F22C333032008BD650 /* bbs_bls12381_sha256_proof.m */; };
+		63C101082C333032008BD650 /* bbs_bls12381_shake256_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100F62C333032008BD650 /* bbs_bls12381_shake256_key_pair.m */; };
+		63C101092C333032008BD650 /* bbs_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100FE2C333032008BD650 /* bbs_proof.m */; };
+		63C1010A2C333032008BD650 /* bbs_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C101002C333032008BD650 /* bbs_signature.m */; };
+		63C1010B2C333032008BD650 /* bbs_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100FC2C333032008BD650 /* bbs_key_pair.m */; };
+		63C1010C2C333032008BD650 /* bbs_bls12381_sha256_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C100F42C333032008BD650 /* bbs_bls12381_sha256_signature.m */; };
+		63C1010D2C333032008BD650 /* PairingCryptoError.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C101032C333032008BD650 /* PairingCryptoError.h */; };
+		63C1010E2C333032008BD650 /* bbs_key_pair.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100FB2C333032008BD650 /* bbs_key_pair.h */; };
+		63C1010F2C333032008BD650 /* bbs_bls12381_sha256_key_pair.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100EF2C333032008BD650 /* bbs_bls12381_sha256_key_pair.h */; };
+		63C101102C333032008BD650 /* bbs_bls12381_sha256_proof.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100F12C333032008BD650 /* bbs_bls12381_sha256_proof.h */; };
+		63C101112C333032008BD650 /* bbs_proof.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100FD2C333032008BD650 /* bbs_proof.h */; };
+		63C101122C333032008BD650 /* bbs_bls12381_sha256_signature.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100F32C333032008BD650 /* bbs_bls12381_sha256_signature.h */; };
+		63C101132C333032008BD650 /* bbs_signature.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100FF2C333032008BD650 /* bbs_signature.h */; };
+		63C101142C333032008BD650 /* pairing_crypto_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C101022C333032008BD650 /* pairing_crypto_common.h */; };
+		63C101152C333032008BD650 /* bbs_bls12381_shake256_proof.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100F72C333032008BD650 /* bbs_bls12381_shake256_proof.h */; };
+		63C101162C333032008BD650 /* pairing_crypto_bbs.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C101012C333032008BD650 /* pairing_crypto_bbs.h */; };
+		63C101172C333032008BD650 /* bbs_bls12381_shake256_key_pair.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100F52C333032008BD650 /* bbs_bls12381_shake256_key_pair.h */; };
+		63C101182C333032008BD650 /* bbs_bls12381_shake256_signature.h in Headers */ = {isa = PBXBuildFile; fileRef = 63C100F92C333032008BD650 /* bbs_bls12381_shake256_signature.h */; };
+		63C1011C2C3331BF008BD650 /* bbs_bls12381_sha256_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C101192C333046008BD650 /* bbs_bls12381_sha256_key_pair.m */; };
+		63C1011D2C3331C6008BD650 /* bbs_bls12381_sha256_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C1011A2C333046008BD650 /* bbs_bls12381_sha256_proof.m */; };
+		63C1011E2C3331C6008BD650 /* bbs_bls12381_sha256_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C1011B2C333046008BD650 /* bbs_bls12381_sha256_signature.m */; };
+		63C101282C335423008BD650 /* libpairing_crypto_c.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63C101272C335423008BD650 /* libpairing_crypto_c.xcframework */; };
 		93CFA5E428AE12FD004EA861 /* libpairing_crypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93CFA5B928AE0E3F004EA861 /* libpairing_crypto.a */; };
-		93CFA5FB28AF0406004EA861 /* bbs_bls12381_sha256_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CFA5F828AF0406004EA861 /* bbs_bls12381_sha256_key_pair.m */; };
-		93CFA5FC28AF0406004EA861 /* bbs_bls12381_sha256_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CFA5F928AF0406004EA861 /* bbs_bls12381_sha256_proof.m */; };
-		93CFA5FD28AF0406004EA861 /* bbs_bls12381_sha256_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CFA5FA28AF0406004EA861 /* bbs_bls12381_sha256_signature.m */; };
 		93EC06A228D306C000DD2D4C /* PairingCryptoError.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06A028D306C000DD2D4C /* PairingCryptoError.m */; };
-		93EC06B028D30E3800DD2D4C /* bbs_bls12381_sha256_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06A728D30E3700DD2D4C /* bbs_bls12381_sha256_key_pair.m */; };
-		93EC06B128D30E3800DD2D4C /* bbs_bls12381_shake256_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06A828D30E3700DD2D4C /* bbs_bls12381_shake256_signature.m */; };
-		93EC06B228D30E3800DD2D4C /* bbs_bls12381_shake256_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06A928D30E3700DD2D4C /* bbs_bls12381_shake256_key_pair.m */; };
-		93EC06B328D30E3800DD2D4C /* bbs_bls12381_sha256_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06AA28D30E3700DD2D4C /* bbs_bls12381_sha256_signature.m */; };
-		93EC06B628D30E3800DD2D4C /* bbs_bls12381_shake256_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06AD28D30E3800DD2D4C /* bbs_bls12381_shake256_proof.m */; };
-		93EC06B728D30E3800DD2D4C /* bbs_bls12381_sha256_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06AE28D30E3800DD2D4C /* bbs_bls12381_sha256_proof.m */; };
-		93EC06B828D30E3800DD2D4C /* bbs_key_pair.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06AF28D30E3800DD2D4C /* bbs_key_pair.m */; };
-		93EC06BA28D30E6C00DD2D4C /* pairing_crypto_bbs.h in Headers */ = {isa = PBXBuildFile; fileRef = 93EC06B928D30E6C00DD2D4C /* pairing_crypto_bbs.h */; };
-		93EC06BD28D3127B00DD2D4C /* libpairing_crypto_c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 93EC06BC28D3127B00DD2D4C /* libpairing_crypto_c.a */; };
-		93EC06C028D312D000DD2D4C /* bbs_proof.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06BE28D312D000DD2D4C /* bbs_proof.m */; };
-		93EC06C128D312D000DD2D4C /* bbs_signature.m in Sources */ = {isa = PBXBuildFile; fileRef = 93EC06BF28D312D000DD2D4C /* bbs_signature.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -48,26 +59,35 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		63C100EF2C333032008BD650 /* bbs_bls12381_sha256_key_pair.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_bls12381_sha256_key_pair.h; sourceTree = "<group>"; };
+		63C100F02C333032008BD650 /* bbs_bls12381_sha256_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_sha256_key_pair.m; sourceTree = "<group>"; };
+		63C100F12C333032008BD650 /* bbs_bls12381_sha256_proof.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_bls12381_sha256_proof.h; sourceTree = "<group>"; };
+		63C100F22C333032008BD650 /* bbs_bls12381_sha256_proof.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_sha256_proof.m; sourceTree = "<group>"; };
+		63C100F32C333032008BD650 /* bbs_bls12381_sha256_signature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_bls12381_sha256_signature.h; sourceTree = "<group>"; };
+		63C100F42C333032008BD650 /* bbs_bls12381_sha256_signature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_sha256_signature.m; sourceTree = "<group>"; };
+		63C100F52C333032008BD650 /* bbs_bls12381_shake256_key_pair.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_bls12381_shake256_key_pair.h; sourceTree = "<group>"; };
+		63C100F62C333032008BD650 /* bbs_bls12381_shake256_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_shake256_key_pair.m; sourceTree = "<group>"; };
+		63C100F72C333032008BD650 /* bbs_bls12381_shake256_proof.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_bls12381_shake256_proof.h; sourceTree = "<group>"; };
+		63C100F82C333032008BD650 /* bbs_bls12381_shake256_proof.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_shake256_proof.m; sourceTree = "<group>"; };
+		63C100F92C333032008BD650 /* bbs_bls12381_shake256_signature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_bls12381_shake256_signature.h; sourceTree = "<group>"; };
+		63C100FA2C333032008BD650 /* bbs_bls12381_shake256_signature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_shake256_signature.m; sourceTree = "<group>"; };
+		63C100FB2C333032008BD650 /* bbs_key_pair.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_key_pair.h; sourceTree = "<group>"; };
+		63C100FC2C333032008BD650 /* bbs_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_key_pair.m; sourceTree = "<group>"; };
+		63C100FD2C333032008BD650 /* bbs_proof.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_proof.h; sourceTree = "<group>"; };
+		63C100FE2C333032008BD650 /* bbs_proof.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_proof.m; sourceTree = "<group>"; };
+		63C100FF2C333032008BD650 /* bbs_signature.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bbs_signature.h; sourceTree = "<group>"; };
+		63C101002C333032008BD650 /* bbs_signature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_signature.m; sourceTree = "<group>"; };
+		63C101012C333032008BD650 /* pairing_crypto_bbs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pairing_crypto_bbs.h; sourceTree = "<group>"; };
+		63C101022C333032008BD650 /* pairing_crypto_common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pairing_crypto_common.h; sourceTree = "<group>"; };
+		63C101032C333032008BD650 /* PairingCryptoError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PairingCryptoError.h; sourceTree = "<group>"; };
+		63C101192C333046008BD650 /* bbs_bls12381_sha256_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_sha256_key_pair.m; sourceTree = "<group>"; };
+		63C1011A2C333046008BD650 /* bbs_bls12381_sha256_proof.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_sha256_proof.m; sourceTree = "<group>"; };
+		63C1011B2C333046008BD650 /* bbs_bls12381_sha256_signature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bbs_bls12381_sha256_signature.m; sourceTree = "<group>"; };
+		63C101272C335423008BD650 /* libpairing_crypto_c.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libpairing_crypto_c.xcframework; path = libraries/libpairing_crypto_c.xcframework; sourceTree = "<group>"; };
 		93CFA5B928AE0E3F004EA861 /* libpairing_crypto.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpairing_crypto.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		93CFA5DA28AE1286004EA861 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		93CFA5E028AE12FD004EA861 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		93CFA5F328AEF471004EA861 /* libpairing_crypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpairing_crypto.a; path = libraries/libpairing_crypto.a; sourceTree = "<group>"; };
-		93CFA5F828AF0406004EA861 /* bbs_bls12381_sha256_key_pair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_sha256_key_pair.m; path = tests/bbs/bbs_bls12381_sha256_key_pair.m; sourceTree = SOURCE_ROOT; };
-		93CFA5F928AF0406004EA861 /* bbs_bls12381_sha256_proof.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_sha256_proof.m; path = tests/bbs/bbs_bls12381_sha256_proof.m; sourceTree = SOURCE_ROOT; };
-		93CFA5FA28AF0406004EA861 /* bbs_bls12381_sha256_signature.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_sha256_signature.m; path = tests/bbs/bbs_bls12381_sha256_signature.m; sourceTree = SOURCE_ROOT; };
 		93EC06A028D306C000DD2D4C /* PairingCryptoError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PairingCryptoError.m; sourceTree = "<group>"; };
-		93EC06A128D306C000DD2D4C /* include */ = {isa = PBXFileReference; lastKnownFileType = folder; path = include; sourceTree = "<group>"; };
-		93EC06A728D30E3700DD2D4C /* bbs_bls12381_sha256_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_sha256_key_pair.m; path = pairing_crypto/bbs/bbs_bls12381_sha256_key_pair.m; sourceTree = "<group>"; };
-		93EC06A828D30E3700DD2D4C /* bbs_bls12381_shake256_signature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_shake256_signature.m; path = pairing_crypto/bbs/bbs_bls12381_shake256_signature.m; sourceTree = "<group>"; };
-		93EC06A928D30E3700DD2D4C /* bbs_bls12381_shake256_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_shake256_key_pair.m; path = pairing_crypto/bbs/bbs_bls12381_shake256_key_pair.m; sourceTree = "<group>"; };
-		93EC06AA28D30E3700DD2D4C /* bbs_bls12381_sha256_signature.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_sha256_signature.m; path = pairing_crypto/bbs/bbs_bls12381_sha256_signature.m; sourceTree = "<group>"; };
-		93EC06AD28D30E3800DD2D4C /* bbs_bls12381_shake256_proof.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_shake256_proof.m; path = pairing_crypto/bbs/bbs_bls12381_shake256_proof.m; sourceTree = "<group>"; };
-		93EC06AE28D30E3800DD2D4C /* bbs_bls12381_sha256_proof.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_bls12381_sha256_proof.m; path = pairing_crypto/bbs/bbs_bls12381_sha256_proof.m; sourceTree = "<group>"; };
-		93EC06AF28D30E3800DD2D4C /* bbs_key_pair.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = bbs_key_pair.m; path = pairing_crypto/bbs/bbs_key_pair.m; sourceTree = "<group>"; };
-		93EC06B928D30E6C00DD2D4C /* pairing_crypto_bbs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = pairing_crypto_bbs.h; path = pairing_crypto/bbs/pairing_crypto_bbs.h; sourceTree = "<group>"; };
-		93EC06BC28D3127B00DD2D4C /* libpairing_crypto_c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpairing_crypto_c.a; path = libraries/universal/libpairing_crypto_c.a; sourceTree = "<group>"; };
-		93EC06BE28D312D000DD2D4C /* bbs_proof.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bbs_proof.m; path = pairing_crypto/bbs/bbs_proof.m; sourceTree = "<group>"; };
-		93EC06BF28D312D000DD2D4C /* bbs_signature.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = bbs_signature.m; path = pairing_crypto/bbs/bbs_signature.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -83,7 +103,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				93EC06BD28D3127B00DD2D4C /* libpairing_crypto_c.a in Frameworks */,
+				63C101282C335423008BD650 /* libpairing_crypto_c.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -93,16 +113,6 @@
 		93CFA5B028AE0E3F004EA861 = {
 			isa = PBXGroup;
 			children = (
-				93EC06BE28D312D000DD2D4C /* bbs_proof.m */,
-				93EC06BF28D312D000DD2D4C /* bbs_signature.m */,
-				93EC06B928D30E6C00DD2D4C /* pairing_crypto_bbs.h */,
-				93EC06A728D30E3700DD2D4C /* bbs_bls12381_sha256_key_pair.m */,
-				93EC06AE28D30E3800DD2D4C /* bbs_bls12381_sha256_proof.m */,
-				93EC06AA28D30E3700DD2D4C /* bbs_bls12381_sha256_signature.m */,
-				93EC06A928D30E3700DD2D4C /* bbs_bls12381_shake256_key_pair.m */,
-				93EC06AD28D30E3800DD2D4C /* bbs_bls12381_shake256_proof.m */,
-				93EC06A828D30E3700DD2D4C /* bbs_bls12381_shake256_signature.m */,
-				93EC06AF28D30E3800DD2D4C /* bbs_key_pair.m */,
 				93CFA5BB28AE0E3F004EA861 /* pairing_crypto */,
 				93CFA5E128AE12FD004EA861 /* Tests */,
 				93CFA5BA28AE0E3F004EA861 /* Products */,
@@ -122,7 +132,27 @@
 		93CFA5BB28AE0E3F004EA861 /* pairing_crypto */ = {
 			isa = PBXGroup;
 			children = (
-				93EC06A128D306C000DD2D4C /* include */,
+				63C100EF2C333032008BD650 /* bbs_bls12381_sha256_key_pair.h */,
+				63C100F02C333032008BD650 /* bbs_bls12381_sha256_key_pair.m */,
+				63C100F12C333032008BD650 /* bbs_bls12381_sha256_proof.h */,
+				63C100F22C333032008BD650 /* bbs_bls12381_sha256_proof.m */,
+				63C100F32C333032008BD650 /* bbs_bls12381_sha256_signature.h */,
+				63C100F42C333032008BD650 /* bbs_bls12381_sha256_signature.m */,
+				63C100F52C333032008BD650 /* bbs_bls12381_shake256_key_pair.h */,
+				63C100F62C333032008BD650 /* bbs_bls12381_shake256_key_pair.m */,
+				63C100F72C333032008BD650 /* bbs_bls12381_shake256_proof.h */,
+				63C100F82C333032008BD650 /* bbs_bls12381_shake256_proof.m */,
+				63C100F92C333032008BD650 /* bbs_bls12381_shake256_signature.h */,
+				63C100FA2C333032008BD650 /* bbs_bls12381_shake256_signature.m */,
+				63C100FB2C333032008BD650 /* bbs_key_pair.h */,
+				63C100FC2C333032008BD650 /* bbs_key_pair.m */,
+				63C100FD2C333032008BD650 /* bbs_proof.h */,
+				63C100FE2C333032008BD650 /* bbs_proof.m */,
+				63C100FF2C333032008BD650 /* bbs_signature.h */,
+				63C101002C333032008BD650 /* bbs_signature.m */,
+				63C101012C333032008BD650 /* pairing_crypto_bbs.h */,
+				63C101022C333032008BD650 /* pairing_crypto_common.h */,
+				63C101032C333032008BD650 /* PairingCryptoError.h */,
 				93EC06A028D306C000DD2D4C /* PairingCryptoError.m */,
 			);
 			path = pairing_crypto;
@@ -131,8 +161,7 @@
 		93CFA5D928AE1286004EA861 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				93EC06BC28D3127B00DD2D4C /* libpairing_crypto_c.a */,
-				93CFA5F328AEF471004EA861 /* libpairing_crypto.a */,
+				63C101272C335423008BD650 /* libpairing_crypto_c.xcframework */,
 				93CFA5DA28AE1286004EA861 /* XCTest.framework */,
 			);
 			name = Frameworks;
@@ -141,11 +170,12 @@
 		93CFA5E128AE12FD004EA861 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				93CFA5F828AF0406004EA861 /* bbs_bls12381_sha256_key_pair.m */,
-				93CFA5F928AF0406004EA861 /* bbs_bls12381_sha256_proof.m */,
-				93CFA5FA28AF0406004EA861 /* bbs_bls12381_sha256_signature.m */,
+				63C101192C333046008BD650 /* bbs_bls12381_sha256_key_pair.m */,
+				63C1011A2C333046008BD650 /* bbs_bls12381_sha256_proof.m */,
+				63C1011B2C333046008BD650 /* bbs_bls12381_sha256_signature.m */,
 			);
-			path = Tests;
+			name = Tests;
+			path = tests;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -155,7 +185,18 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				93EC06BA28D30E6C00DD2D4C /* pairing_crypto_bbs.h in Headers */,
+				63C1010D2C333032008BD650 /* PairingCryptoError.h in Headers */,
+				63C1010E2C333032008BD650 /* bbs_key_pair.h in Headers */,
+				63C1010F2C333032008BD650 /* bbs_bls12381_sha256_key_pair.h in Headers */,
+				63C101102C333032008BD650 /* bbs_bls12381_sha256_proof.h in Headers */,
+				63C101112C333032008BD650 /* bbs_proof.h in Headers */,
+				63C101122C333032008BD650 /* bbs_bls12381_sha256_signature.h in Headers */,
+				63C101132C333032008BD650 /* bbs_signature.h in Headers */,
+				63C101142C333032008BD650 /* pairing_crypto_common.h in Headers */,
+				63C101152C333032008BD650 /* bbs_bls12381_shake256_proof.h in Headers */,
+				63C101162C333032008BD650 /* pairing_crypto_bbs.h in Headers */,
+				63C101172C333032008BD650 /* bbs_bls12381_shake256_key_pair.h in Headers */,
+				63C101182C333032008BD650 /* bbs_bls12381_shake256_signature.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -205,7 +246,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastUpgradeCheck = 1340;
+				LastUpgradeCheck = 1600;
 				TargetAttributes = {
 					93CFA5B828AE0E3F004EA861 = {
 						CreatedOnToolsVersion = 13.4.1;
@@ -249,16 +290,16 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				93EC06C028D312D000DD2D4C /* bbs_proof.m in Sources */,
-				93EC06B028D30E3800DD2D4C /* bbs_bls12381_sha256_key_pair.m in Sources */,
-				93EC06C128D312D000DD2D4C /* bbs_signature.m in Sources */,
-				93EC06B128D30E3800DD2D4C /* bbs_bls12381_shake256_signature.m in Sources */,
-				93EC06B228D30E3800DD2D4C /* bbs_bls12381_shake256_key_pair.m in Sources */,
-				93EC06B328D30E3800DD2D4C /* bbs_bls12381_sha256_signature.m in Sources */,
-				93EC06B628D30E3800DD2D4C /* bbs_bls12381_shake256_proof.m in Sources */,
-				93EC06B728D30E3800DD2D4C /* bbs_bls12381_sha256_proof.m in Sources */,
-				93EC06B828D30E3800DD2D4C /* bbs_key_pair.m in Sources */,
 				93EC06A228D306C000DD2D4C /* PairingCryptoError.m in Sources */,
+				63C101042C333032008BD650 /* bbs_bls12381_shake256_proof.m in Sources */,
+				63C101052C333032008BD650 /* bbs_bls12381_sha256_key_pair.m in Sources */,
+				63C101062C333032008BD650 /* bbs_bls12381_shake256_signature.m in Sources */,
+				63C101072C333032008BD650 /* bbs_bls12381_sha256_proof.m in Sources */,
+				63C101082C333032008BD650 /* bbs_bls12381_shake256_key_pair.m in Sources */,
+				63C101092C333032008BD650 /* bbs_proof.m in Sources */,
+				63C1010A2C333032008BD650 /* bbs_signature.m in Sources */,
+				63C1010B2C333032008BD650 /* bbs_key_pair.m in Sources */,
+				63C1010C2C333032008BD650 /* bbs_bls12381_sha256_signature.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -266,9 +307,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				93CFA5FD28AF0406004EA861 /* bbs_bls12381_sha256_signature.m in Sources */,
-				93CFA5FC28AF0406004EA861 /* bbs_bls12381_sha256_proof.m in Sources */,
-				93CFA5FB28AF0406004EA861 /* bbs_bls12381_sha256_key_pair.m in Sources */,
+				63C1011D2C3331C6008BD650 /* bbs_bls12381_sha256_proof.m in Sources */,
+				63C1011E2C3331C6008BD650 /* bbs_bls12381_sha256_signature.m in Sources */,
+				63C1011C2C3331BF008BD650 /* bbs_bls12381_sha256_key_pair.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -289,11 +330,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -320,8 +358,6 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -334,16 +370,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				"HEADER_SEARCH_PATHS[arch=*]" = (
-					libraries,
-					pairing_crypto,
-				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
-				VALID_ARCHS = "arm64 arm64e x86_64";
 			};
 			name = Debug;
 		};
@@ -353,11 +384,8 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
@@ -384,7 +412,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -392,29 +419,23 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				"HEADER_SEARCH_PATHS[arch=*]" = libraries;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
-				VALID_ARCHS = "arm64 arm64e x86_64";
 			};
 			name = Release;
 		};
 		93CFA5C328AE0E3F004EA861 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/libraries",
-					"$(PROJECT_DIR)/libraries/universal",
-				);
-				OTHER_LDFLAGS = "-ObjC";
-				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = ./libraries/x86_64/libpairing_crypto_c.a;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -422,16 +443,12 @@
 		93CFA5C428AE0E3F004EA861 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/libraries",
-					"$(PROJECT_DIR)/libraries/universal",
-				);
-				OTHER_LDFLAGS = "-ObjC";
-				"OTHER_LDFLAGS[arch=*]" = ./libraries/universal/libpairing_crypto_c.a;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/wrappers/obj-c/scripts/update-libraries.sh b/wrappers/obj-c/scripts/update-libraries.sh
index 7b0303d9..7ef4311e 100755
--- a/wrappers/obj-c/scripts/update-libraries.sh
+++ b/wrappers/obj-c/scripts/update-libraries.sh
@@ -22,5 +22,11 @@ source $C_WRAPPER_DIRECTORY/scripts/build-platform-targets.sh IOS $C_WRAPPER_DIR
 
 # Copy to the external libraries folder specified in podspec
 mkdir -p "$CURRENT_SCRIPT_DIRECTORY/../libraries"
-cp "$C_WRAPPER_DIRECTORY/out/ios/universal/$LIBRARY_FILE.a" \
-   "$CURRENT_SCRIPT_DIRECTORY/../libraries/$LIBRARY_FILE.a"
+# mkdir -p "$CURRENT_SCRIPT_DIRECTORY/../libraries/sim"
+# cp "$C_WRAPPER_DIRECTORY/out/ios/aarch64-sim/$LIBRARY_FILE.a" \
+#   "$CURRENT_SCRIPT_DIRECTORY/../libraries/sim/$LIBRARY_FILE.a"
+# cp "$C_WRAPPER_DIRECTORY/out/ios/universal/$LIBRARY_FILE.a" \
+#   "$CURRENT_SCRIPT_DIRECTORY/../libraries/$LIBRARY_FILE.a"
+
+rm -r $CURRENT_SCRIPT_DIRECTORY/../libraries/*
+xcodebuild -create-xcframework -library $C_WRAPPER_DIRECTORY/out/ios/universal-sim/$LIBRARY_FILE.a -library $C_WRAPPER_DIRECTORY/out/ios/aarch64/$LIBRARY_FILE.a -output $CURRENT_SCRIPT_DIRECTORY/../libraries/$LIBRARY_FILE.xcframework 
diff --git a/wrappers/react-native/example/Gemfile.lock b/wrappers/react-native/example/Gemfile.lock
index dcc81884..b3cedcda 100644
--- a/wrappers/react-native/example/Gemfile.lock
+++ b/wrappers/react-native/example/Gemfile.lock
@@ -72,8 +72,10 @@ GEM
     nap (1.1.0)
     netrc (0.11.0)
     public_suffix (4.0.7)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     ruby-macho (2.5.1)
+    strscan (3.1.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
diff --git a/wrappers/react-native/example/ios/Podfile.lock b/wrappers/react-native/example/ios/Podfile.lock
index 4fd05958..720ac7f1 100644
--- a/wrappers/react-native/example/ios/Podfile.lock
+++ b/wrappers/react-native/example/ios/Podfile.lock
@@ -76,12 +76,12 @@ PODS:
   - hermes-engine (0.11.0)
   - libevent (2.1.12)
   - OpenSSL-Universal (1.1.1100)
-  - pairing-crypto-rn (0.1.0):
-    - pairing-crypto-rn/Default (= 0.1.0)
-  - pairing-crypto-rn/Default (0.1.0):
+  - pairing-crypto-rn (0.4.2):
+    - pairing-crypto-rn/Default (= 0.4.2)
+  - pairing-crypto-rn/Default (0.4.2):
     - pairing-crypto-rn/PairingCrypto
     - React-Core
-  - pairing-crypto-rn/PairingCrypto (0.1.0)
+  - pairing-crypto-rn/PairingCrypto (0.4.2)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
     - DoubleConversion
@@ -544,7 +544,7 @@ SPEC CHECKSUMS:
   hermes-engine: 84e3af1ea01dd7351ac5d8689cbbea1f9903ffc3
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
-  pairing-crypto-rn: a5977cfd5ca893f8064813d25afc21851479cc97
+  pairing-crypto-rn: bbeffe63f775e945a805ffc9c7229f1c60739bb8
   RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
   RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0
   RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e
@@ -577,4 +577,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4c16bafdbb43a27a7cade89e710c04a91f5017a3
 
-COCOAPODS: 1.11.3
\ No newline at end of file
+COCOAPODS: 1.15.2
diff --git a/wrappers/react-native/example/yarn.lock b/wrappers/react-native/example/yarn.lock
index 896a4fac..09f526c4 100644
--- a/wrappers/react-native/example/yarn.lock
+++ b/wrappers/react-native/example/yarn.lock
@@ -6489,21 +6489,16 @@ write-file-atomic@^4.0.1:
     signal-exit "^3.0.7"
 
 ws@^6.1.4:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee"
+  integrity sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7, ws@^7.5.1:
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
-  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
-
-ws@^7.0.0:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+ws@^7, ws@^7.0.0, ws@^7.5.1:
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 xcode@^3.0.0:
   version "3.0.1"
diff --git a/wrappers/react-native/yarn.lock b/wrappers/react-native/yarn.lock
index 56481f97..3502a549 100644
--- a/wrappers/react-native/yarn.lock
+++ b/wrappers/react-native/yarn.lock
@@ -5577,16 +5577,16 @@ write-file-atomic@^2.3.0:
     signal-exit "^3.0.2"
 
 ws@^6.1.4:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.3.tgz#ccc96e4add5fd6fedbc491903075c85c5a11d9ee"
+  integrity sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@^7, ws@^7.5.1:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 xcode@^3.0.0:
   version "3.0.1"
diff --git a/wrappers/wasm/yarn.lock b/wrappers/wasm/yarn.lock
index e1d5b46e..61fd6a92 100644
--- a/wrappers/wasm/yarn.lock
+++ b/wrappers/wasm/yarn.lock
@@ -1188,11 +1188,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
@@ -1649,10 +1649,10 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -3310,9 +3310,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.4.6:
-  version "7.5.6"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"