diff --git a/README.md b/README.md
index 765d0f1..80ffedb 100644
--- a/README.md
+++ b/README.md
@@ -71,12 +71,12 @@ To start off first import `AbrevvaBle` from this module
 import {AbrevvaBle} from 'react-natice-example-app';
 
 async function scanForBleDevices(androidNeverForLocation: Boolean, timeout: Number){
-    await AbrevvaBle.initialize({
-        androidNeverForLocation: true,
-    });
+    const androidNeverForLocation = true;
+    await AbrevvaBle.initialize(androidNeverForLocation);
 
+    const timeout = 10_000
     AbrevvaBle.requestLEScan(
-        { timeout: 10_000 }, 
+        timeout, 
         (data: ScanResult) => {
             console.log(`found device: ${data.name}`);
         },
@@ -95,24 +95,24 @@ async function scanForBleDevices(androidNeverForLocation: Boolean, timeout: Numb
 With the signalize method you can localize EVVA components. On a successful signalization the component will emit a melody indicating its location.
 
 ```typescript
-    AbrevvaBle.signalize(
-        {'deviceID': deviceID},
-        () => {
-        console.log(`Signalized /w success=${it}`)
-        }    
-    );
+AbrevvaBle.signalize(
+    deviceID,
+    () => {
+    console.log(`Signalized /w success=${it}`)
+    }    
+);
 ```
 ### Perform disengage for EVVA components
 
 For the component disengage you have to provide access credentials to the EVVA component. Those are generally acquired in the form of access media metadata from the Xesar software.
 
 ```typescript
-    AbrevvaBle.disengage({
-        mobileId: '',
-        mobileDeviceKey:: '',
-        mobileGroupId: '',
-        mobileAccessData: '',
-        isPermanentRelease: '',
-        timeout: 10_000
-    });
+AbrevvaBle.disengage(
+    mobileId: '',
+    mobileDeviceKey:: '',
+    mobileGroupId: '',
+    mobileAccessData: '',
+    isPermanentRelease: '',
+    timeout: 10_000
+);
 ```
\ No newline at end of file
diff --git a/android/src/main/java/com/exampleapp/AbrevvaBleModule.kt b/android/src/main/java/com/exampleapp/AbrevvaBleModule.kt
index fe2e74a..2f32428 100644
--- a/android/src/main/java/com/exampleapp/AbrevvaBleModule.kt
+++ b/android/src/main/java/com/exampleapp/AbrevvaBleModule.kt
@@ -461,12 +461,16 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
 
     // not needed for Android
     @ReactMethod
-    fun setSupportedEvents(options: ReadableArray, promise: Promise) {
+    fun setSupportedEvents(options: ReadableMap, promise: Promise) {
         promise.resolve(null)
     }
 
     override fun getName(): String {
-        return ("AbrevvaBle")
+        return NAME
+    }
+
+    companion object {
+        const val NAME = "AbrevvaBle"
     }
 
     @ReactMethod
diff --git a/android/src/main/java/com/exampleapp/AbrevvaCryptoModule.kt b/android/src/main/java/com/exampleapp/AbrevvaCryptoModule.kt
index 486903e..bbc0ab2 100644
--- a/android/src/main/java/com/exampleapp/AbrevvaCryptoModule.kt
+++ b/android/src/main/java/com/exampleapp/AbrevvaCryptoModule.kt
@@ -245,6 +245,11 @@ class AbrevvaCryptoModule(reactContext: ReactApplicationContext) :
     }
 
     override fun getName(): String {
-        return ("AbrevvaCrypto")
+        return NAME
     }
+
+    companion object {
+        const val NAME = "AbrevvaCrypto"
+    }
+    
 }
\ No newline at end of file
diff --git a/android/src/main/java/com/exampleapp/AbrevvaNfcModule.kt b/android/src/main/java/com/exampleapp/AbrevvaNfcModule.kt
index 6264b3a..5a7a01d 100644
--- a/android/src/main/java/com/exampleapp/AbrevvaNfcModule.kt
+++ b/android/src/main/java/com/exampleapp/AbrevvaNfcModule.kt
@@ -22,7 +22,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish
 import java.util.Timer
 import java.util.TimerTask
 
-class ReactNativeAbrevvaModule(reactContext: ReactApplicationContext) :
+class AbrevvaNfcModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
 
   private val host = "172.16.2.91"
diff --git a/android/src/main/java/com/exampleapp/ExampleAppPackage.kt b/android/src/main/java/com/exampleapp/ExampleAppPackage.kt
index 87a79df..c1a9b31 100644
--- a/android/src/main/java/com/exampleapp/ExampleAppPackage.kt
+++ b/android/src/main/java/com/exampleapp/ExampleAppPackage.kt
@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.ViewManager
 
 class ExampleAppPackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(ReactNativeAbrevvaModule(reactContext)) + listOf(AbrevvaBleModule(reactContext)) + listOf(AbrevvaCryptoModule(reactContext))
+    return listOf(AbrevvaCryptoModule(reactContext)) + listOf(AbrevvaNfcModule(reactContext)) + listOf(AbrevvaBleModule(reactContext))
   }
 
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
diff --git a/example/ios/ExampleAppExample.xcodeproj/project.pbxproj b/example/ios/ExampleAppExample.xcodeproj/project.pbxproj
index 7bc7e59..07d8ebd 100644
--- a/example/ios/ExampleAppExample.xcodeproj/project.pbxproj
+++ b/example/ios/ExampleAppExample.xcodeproj/project.pbxproj
@@ -13,8 +13,8 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		7C2CCBD275D987DDA9C659B6 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 61DF2990903C4888EBB0D63C /* PrivacyInfo.xcprivacy */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
-		8687B759D7148E93A7141AE2 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40417D6C0177F7DDDB680F61 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework */; };
-		C35B25D92894CFFC7F105772 /* Pods_ExampleAppExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF333FDF0DC0B69B958057A /* Pods_ExampleAppExample.framework */; };
+		C31ABF8F57C71FA25518C699 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43FFFCB0400B47BFEE01056C /* Pods_ExampleAppExample_ExampleAppExampleTests.framework */; };
+		EF82AAB8D7CDA185B168B4CE /* Pods_ExampleAppExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75262DEC733135018D6B2C7C /* Pods_ExampleAppExample.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -31,7 +31,8 @@
 		00E356EE1AD99517003FC87E /* ExampleAppExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleAppExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* ExampleAppExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleAppExampleTests.m; sourceTree = "<group>"; };
-		04E7B78608C671A705D5C68F /* Pods-ExampleAppExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample.release.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample/Pods-ExampleAppExample.release.xcconfig"; sourceTree = "<group>"; };
+		05868A8BF1FC288BEBB212D0 /* Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample-ExampleAppExampleTests/Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig"; sourceTree = "<group>"; };
+		125DBE2C52B81A08A4D3D09B /* Pods-ExampleAppExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample.debug.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample/Pods-ExampleAppExample.debug.xcconfig"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* ExampleAppExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleAppExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ExampleAppExample/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = ExampleAppExample/AppDelegate.mm; sourceTree = "<group>"; };
@@ -39,13 +40,12 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ExampleAppExample/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ExampleAppExample/main.m; sourceTree = "<group>"; };
 		13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = ExampleAppExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
-		2AC822BC56870058C79802CC /* Pods-ExampleAppExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample.debug.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample/Pods-ExampleAppExample.debug.xcconfig"; sourceTree = "<group>"; };
-		3AF333FDF0DC0B69B958057A /* Pods_ExampleAppExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleAppExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		40417D6C0177F7DDDB680F61 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleAppExample_ExampleAppExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		17EB8284C14F4E99984AC2F2 /* Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample-ExampleAppExampleTests/Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
+		43FFFCB0400B47BFEE01056C /* Pods_ExampleAppExample_ExampleAppExampleTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleAppExample_ExampleAppExampleTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		61DF2990903C4888EBB0D63C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = ExampleAppExample/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		75262DEC733135018D6B2C7C /* Pods_ExampleAppExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExampleAppExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ExampleAppExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		E10DE97995006988255D071C /* Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample-ExampleAppExampleTests/Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig"; sourceTree = "<group>"; };
-		E61DE6C30649A291134AF714 /* Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample-ExampleAppExampleTests/Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
+		EC04F70477194A5A6AC4C19B /* Pods-ExampleAppExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleAppExample.release.xcconfig"; path = "Target Support Files/Pods-ExampleAppExample/Pods-ExampleAppExample.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -54,7 +54,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8687B759D7148E93A7141AE2 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework in Frameworks */,
+				C31ABF8F57C71FA25518C699 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -62,7 +62,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C35B25D92894CFFC7F105772 /* Pods_ExampleAppExample.framework in Frameworks */,
+				EF82AAB8D7CDA185B168B4CE /* Pods_ExampleAppExample.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -105,8 +105,8 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				3AF333FDF0DC0B69B958057A /* Pods_ExampleAppExample.framework */,
-				40417D6C0177F7DDDB680F61 /* Pods_ExampleAppExample_ExampleAppExampleTests.framework */,
+				75262DEC733135018D6B2C7C /* Pods_ExampleAppExample.framework */,
+				43FFFCB0400B47BFEE01056C /* Pods_ExampleAppExample_ExampleAppExampleTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -145,10 +145,10 @@
 		BBD78D7AC51CEA395F1C20DB /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				2AC822BC56870058C79802CC /* Pods-ExampleAppExample.debug.xcconfig */,
-				04E7B78608C671A705D5C68F /* Pods-ExampleAppExample.release.xcconfig */,
-				E61DE6C30649A291134AF714 /* Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig */,
-				E10DE97995006988255D071C /* Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig */,
+				125DBE2C52B81A08A4D3D09B /* Pods-ExampleAppExample.debug.xcconfig */,
+				EC04F70477194A5A6AC4C19B /* Pods-ExampleAppExample.release.xcconfig */,
+				17EB8284C14F4E99984AC2F2 /* Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig */,
+				05868A8BF1FC288BEBB212D0 /* Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -160,11 +160,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "ExampleAppExampleTests" */;
 			buildPhases = (
-				1AD0356DF8B35650ABED1A07 /* [CP] Check Pods Manifest.lock */,
+				DB3AFB7B250174089CEA8555 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				9A917FE31D3C5CE529401049 /* [CP] Embed Pods Frameworks */,
+				CD69EC139D5FC9C37AA3D2FC /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -180,12 +180,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "ExampleAppExample" */;
 			buildPhases = (
-				7F5EB9FE8462B243FF7FFE7E /* [CP] Check Pods Manifest.lock */,
+				702D2827E8C928554D0EAA0F /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				51A1B50F12911CCD135E1235 /* [CP] Embed Pods Frameworks */,
+				05336DA818B8D9AF17EF01E7 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -269,29 +269,7 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
-		1AD0356DF8B35650ABED1A07 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-ExampleAppExample-ExampleAppExampleTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		51A1B50F12911CCD135E1235 /* [CP] Embed Pods Frameworks */ = {
+		05336DA818B8D9AF17EF01E7 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -308,7 +286,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleAppExample/Pods-ExampleAppExample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		7F5EB9FE8462B243FF7FFE7E /* [CP] Check Pods Manifest.lock */ = {
+		702D2827E8C928554D0EAA0F /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -330,7 +308,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		9A917FE31D3C5CE529401049 /* [CP] Embed Pods Frameworks */ = {
+		CD69EC139D5FC9C37AA3D2FC /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -347,6 +325,28 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleAppExample-ExampleAppExampleTests/Pods-ExampleAppExample-ExampleAppExampleTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		DB3AFB7B250174089CEA8555 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-ExampleAppExample-ExampleAppExampleTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -380,7 +380,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E61DE6C30649A291134AF714 /* Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig */;
+			baseConfigurationReference = 17EB8284C14F4E99984AC2F2 /* Pods-ExampleAppExample-ExampleAppExampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -407,7 +407,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E10DE97995006988255D071C /* Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig */;
+			baseConfigurationReference = 05868A8BF1FC288BEBB212D0 /* Pods-ExampleAppExample-ExampleAppExampleTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
@@ -431,7 +431,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2AC822BC56870058C79802CC /* Pods-ExampleAppExample.debug.xcconfig */;
+			baseConfigurationReference = 125DBE2C52B81A08A4D3D09B /* Pods-ExampleAppExample.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
@@ -459,7 +459,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 04E7B78608C671A705D5C68F /* Pods-ExampleAppExample.release.xcconfig */;
+			baseConfigurationReference = EC04F70477194A5A6AC4C19B /* Pods-ExampleAppExample.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
diff --git a/example/ios/ExampleAppExample.xcworkspace/xcuserdata/matthias.xcuserdatad/UserInterfaceState.xcuserstate b/example/ios/ExampleAppExample.xcworkspace/xcuserdata/matthias.xcuserdatad/UserInterfaceState.xcuserstate
index 547c60b..6e713f1 100644
Binary files a/example/ios/ExampleAppExample.xcworkspace/xcuserdata/matthias.xcuserdatad/UserInterfaceState.xcuserstate and b/example/ios/ExampleAppExample.xcworkspace/xcuserdata/matthias.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 00a2f0d..cd72f0c 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -88,7 +88,7 @@ const CryptoScreen = () => {
         <Button
           text="random"
           onPressFunction={() => {
-            AbrevvaCrypto.random({ numBytes: 4 }).then((ret: any) => {
+            AbrevvaCrypto.random(4).then((ret: any) => {
               setResult(`random:\n${ret.value}\n\n`);
             });
           }}
diff --git a/example/src/BleScreenComponents.tsx b/example/src/BleScreenComponents.tsx
index aa19e56..4c5b2e6 100644
--- a/example/src/BleScreenComponents.tsx
+++ b/example/src/BleScreenComponents.tsx
@@ -95,19 +95,6 @@ const ScanResults = ({ setStatus }) => {
   const [deviceList, setdeviceList] = useState<ScanResult[]>([]);
   const [refreshing, setRefreshing] = useState(false);
 
-  const onRefresh = () => {
-    setStatus('none');
-    setRefreshing(true);
-    setdeviceList([]);
-
-    AbrevvaBle.stopLEScan().then(() => {
-      void AbrevvaBle.requestLEScan({ timeout: SCAN_TIMEOUT }, scanRequestCallback);
-    });
-    setTimeout(() => {
-      setRefreshing(false);
-    }, SCAN_TIMEOUT);
-  };
-
   const scanRequestCallback = (data: ScanResult) => {
     if (data.manufacturerData !== undefined && '2153' in data.manufacturerData) {
       const md = new Uint8Array(data.manufacturerData!['2153'].buffer);
@@ -125,9 +112,43 @@ const ScanResults = ({ setStatus }) => {
     }
   };
 
+  const onRefresh = () => {
+    setStatus('none');
+    setRefreshing(true);
+    setdeviceList([]);
+
+    const timeout: NodeJS.Timeout = setTimeout(() => {
+      setRefreshing(false);
+    }, SCAN_TIMEOUT);
+    AbrevvaBle.stopLEScan()
+      .then(() => {
+        void AbrevvaBle.requestLEScan(
+          scanRequestCallback,
+          (address: string) => {
+            console.log(`connected to Device =${address}`);
+          },
+          (address: string) => {
+            console.log(`disconnected from Device =${address}`);
+          },
+        );
+      })
+      .catch((e) => {
+        console.log(e);
+        clearTimeout(timeout);
+      });
+  };
+
   useEffect(() => {
-    AbrevvaBle.initialize({ androidNeverForLocation: true }).then(() => {
-      void AbrevvaBle.requestLEScan({ timeout: SCAN_TIMEOUT }, scanRequestCallback);
+    AbrevvaBle.initialize(true).then(() => {
+      void AbrevvaBle.requestLEScan(
+        scanRequestCallback,
+        (address: string) => {
+          console.log(`connected to Device =${address}`);
+        },
+        (address: string) => {
+          console.log(`disconnected from Device =${address}`);
+        },
+      );
     });
   }, []);
 
@@ -170,11 +191,9 @@ async function mobileIdentificationMediumService(data: ScanResult, setStatus: an
     });
 
     await AbrevvaBle.startNotifications(
-      {
-        deviceId: data.device.deviceId,
-        service: SERVICE,
-        characteristic: CHARACTERISTICS.ACCESS_STATUS,
-      },
+      data.device.deviceId,
+      SERVICE,
+      CHARACTERISTICS.ACCESS_STATUS,
       (event: ReadResult) => {
         newStatus = event.value!;
       },
diff --git a/ios/ble/AbrevvaBle.swift b/ios/ble/AbrevvaBle.swift
index 63a282a..206e08c 100644
--- a/ios/ble/AbrevvaBle.swift
+++ b/ios/ble/AbrevvaBle.swift
@@ -112,11 +112,9 @@ public class AbrevvaBle: RCTEventEmitter {
                 let data = self.getScanResultDict(device, advertisementData, rssi)
                 self.sendEvent(withName: "onScanResult", body: data)
             },{ address in
-                self.sendEvent(withName: "connected|\(address)", body: nil)
-
+                self.sendEvent(withName: "onConnect", body: address)
             },{ address in
-                self.sendEvent(withName: "disconnected|\(address)", body: nil)
-
+                self.sendEvent(withName: "onDisconnect", body: address)
             },
             timeout
         )
diff --git a/ios/nfc/AbrevvaNfc.swift b/ios/nfc/AbrevvaNfc.swift
index 759eb79..8516ed9 100644
--- a/ios/nfc/AbrevvaNfc.swift
+++ b/ios/nfc/AbrevvaNfc.swift
@@ -7,8 +7,7 @@ import CoreNFC
 import AbrevvaSDK
 
 @objc(AbrevvaNfc)
-class AbrevvaNfc: NSObject {
-
+class AbrevvaNfc: NSObject, NFCSessionDelegate {
 
     let HOST =  "172.16.2.91" //"172.16.158.30" //
     let PORT: UInt16 = 1883
@@ -18,6 +17,11 @@ class AbrevvaNfc: NSObject {
     private var mqtt5Client: MQTT5Client?
     private var nfcSession = NFCSession()
     
+    override init() {
+        super.init()
+        nfcSession.delegate = self
+    }
+    
     @objc func connect() {
         var clientCertArray = getClientCertFromP12File(certName: "client-ios.p12", certPassword: "123")
         self.clientID = CLIENTID
@@ -25,10 +29,10 @@ class AbrevvaNfc: NSObject {
         mqtt5Client = MQTT5Client(clientID: clientID, host: HOST, port: PORT, clientCertArray:clientCertArray)
         mqtt5Client?.setOnMessageRecieveHandler(handler: onMessageRecieveHandler)
         mqtt5Client?.setDidStateChangeToHandler(handler: didStateChangeToHandler)
-        mqtt5Client?.connect()
         
-        // nfcSession.setPublishKyOnHandler(handler: mqtt5Client!.publishKyOn)
-        // nfcSession.setPublishKeyOffHander(handler: mqtt5Client!.publishKyOff)
+        
+        mqtt5Client?.connect()
+
     }
     
     @objc func disconnect() {
@@ -103,4 +107,20 @@ class AbrevvaNfc: NSObject {
         self.mqtt5Client?.disconnect()
         self.nfcSession.invalidateSession()
     }
+    
+    func sessionDidStart(_ withSuccess: Bool) {
+    
+    }
+    
+    func sessionDidClose(_ withError: (any Error)?) {
+        
+    }
+    
+    func sessionDidReceiveKeyOnEvent(_ tagID: Data, _ historicalBytes: Data) {
+        mqtt5Client?.publishKyOn(identifier: tagID.toHexString(), historicalBytes: historicalBytes.toHexString())
+    }
+    
+    func sessionDidReceiveKeyOffEvent(_ tagID: Data, _ historicalBytes: Data) {
+        mqtt5Client?.publishKyOff(identifier: tagID.toHexString(), historicalBytes: historicalBytes.toHexString())
+    }
 }
diff --git a/src/index.tsx b/src/index.tsx
index 4732527..aff6f56 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -14,13 +14,14 @@ import { Platform } from 'react-native';
 
 import { convertObject, convertValue } from './conversion';
 import type {
-  BooleanResult,
+  AbrevvaBLEInterface,
+  AbrevvaCryptoInterface,
+  AbrevvaNfcInterface,
   DeviceIdOptions,
   DisengageOptions,
-  InitializeOptions,
   ReadOptions,
   ReadResult,
-  RequestBleDeviceOptions,
+  ScanMode,
   ScanResult,
   ScanResultInternal,
   SignalizeOptions,
@@ -29,206 +30,321 @@ import type {
   WriteOptions,
 } from './interfaces';
 
-class BleClient {
-  private abrevvaBle: any;
+const NativeModuleNfc: AbrevvaNfcInterface = NativeModules.AbrevvaNfc
+  ? NativeModules.AbrevvaNfc
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error('Linking Error AbrevvaNfc');
+        },
+      },
+    );
+
+const NativeModuleCrypto = NativeModules.AbrevvaCrypto
+  ? NativeModules.AbrevvaCrypto
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error('Linking Error AbrevvaNfc');
+        },
+      },
+    );
+
+const NativeModuleBle = NativeModules.AbrevvaBle
+  ? NativeModules.AbrevvaBle
+  : new Proxy(
+      {},
+      {
+        get() {
+          throw new Error('Linking Error AbrevvaBle');
+        },
+      },
+    );
 
+class AbrevvaBleModule implements AbrevvaBLEInterface {
   private listeners: Map<String, EmitterSubscription | undefined>;
   private eventEmitter: NativeEventEmitter | undefined;
 
   constructor() {
-    this.abrevvaBle = NativeModules.AbrevvaBle
-      ? NativeModules.AbrevvaBle
-      : new Proxy(
-          {},
-          {
-            get() {
-              throw new Error('Linking Error AbrevvaBle');
-            },
-          },
-        );
     this.eventEmitter = Platform.select({
-      ios: new NativeEventEmitter(this.abrevvaBle),
+      ios: new NativeEventEmitter(NativeModuleBle),
       android: DeviceEventEmitter,
     });
 
     this.listeners = new Map<String, EmitterSubscription | undefined>([
       ['onEnabledChanged', undefined],
       ['onScanResult', undefined],
+      ['onConnect', undefined],
+      ['onDisconnect', undefined],
     ]);
 
-    this.abrevvaBle.setSupportedEvents({ events: [...this.listeners.keys()] });
+    NativeModuleBle.setSupportedEvents({ events: [...this.listeners.keys()] });
   }
 
-  async initialize(options: InitializeOptions): Promise<void> {
-    return await this.abrevvaBle.initialize(options);
+  async initialize(androidNeverForLocation?: boolean): Promise<void> {
+    return NativeModuleBle.initialize(
+      this.removeUndefinedField({ androidNeverForLocation: androidNeverForLocation }),
+    );
   }
 
-  async isEnabled(): Promise<BooleanResult> {
-    return await this.abrevvaBle.isEnabled();
+  async isEnabled(): Promise<boolean> {
+    return NativeModuleBle.isEnabled();
   }
 
-  async isLocationEnabled(options: InitializeOptions): Promise<void> {
-    return await this.abrevvaBle.isLocationEnabled(options);
+  async isLocationEnabled(): Promise<boolean> {
+    return NativeModuleBle.isLocationEnabled();
   }
 
-  async startEnabledNotifications(callback: (result: BooleanResult) => void): Promise<void> {
+  async startEnabledNotifications(callback: (result: boolean) => void): Promise<void> {
     if (this.eventEmitter === undefined) {
-      console.error('unsupported platform');
-      return;
+      return Promise.reject('unsupported platform');
     }
-    this.listeners.get('onEnabledChanged')?.remove();
+
     this.listeners.set(
       'onEnabledChanged',
       this.eventEmitter.addListener('onEnabledChanged', (event: any) => {
         callback(event.value);
       }),
     );
-    return this.abrevvaBle.startEnabledNotifications();
+    return NativeModuleBle.startEnabledNotifications();
   }
 
   async stopEnabledNotifications(): Promise<void> {
-    if (this.listeners.get('onEnabledChanged') !== undefined) {
-      this.listeners.get('onEnabledChanged')?.remove();
-      this.listeners.set('onEnabledChanged', undefined);
-    }
-    return await this.abrevvaBle.stopEnabledNotifications();
+    this.listeners.set('onEnabledChanged', undefined);
+    return await NativeModuleBle.stopEnabledNotifications();
   }
 
   async openLocationSettings(): Promise<void> {
-    return await this.abrevvaBle.openLocationSettings();
+    return await NativeModuleBle.openLocationSettings();
   }
 
   async openBluetoothSettings(): Promise<void> {
-    return await this.abrevvaBle.openBluetoothSettings();
+    return await NativeModuleBle.openBluetoothSettings();
   }
 
   async openAppSettings(): Promise<void> {
-    return await this.abrevvaBle.openAppSettings();
+    return await NativeModuleBle.openAppSettings();
+  }
+
+  private removeUndefinedField(obj: any) {
+    for (let propName in obj) {
+      obj[propName] ?? delete obj[propName];
+    }
+    return obj;
   }
 
   async requestLEScan(
-    options: RequestBleDeviceOptions,
-    callback: (result: ScanResult) => void,
+    onScanResultCallback: (result: ScanResult) => void,
+    onConnectCallback: (address: string) => void,
+    onDisconnectCallback: (address: string) => void,
+    services?: string[],
+    name?: string,
+    namePrefix?: string,
+    optionalServices?: string[],
+    allowDuplicates?: boolean,
+    scanMode?: ScanMode,
+    timeout?: number,
   ): Promise<void> {
     if (this.eventEmitter === undefined) {
-      console.error('unsupported platform');
-      return;
+      return Promise.reject('unsupported platform');
     }
-    this.listeners.get('onScanResult')?.remove();
-
-    const listener = this.eventEmitter.addListener(
-      'onScanResult',
-      (resultInternal: ScanResultInternal) => {
-        const result: ScanResult = {
-          ...resultInternal,
-          manufacturerData: convertObject(resultInternal.manufacturerData),
-          serviceData: convertObject(resultInternal.serviceData),
-          rawAdvertisement: resultInternal.rawAdvertisement
-            ? convertValue(resultInternal.rawAdvertisement)
-            : undefined,
-        };
-        callback(result);
-      },
+    if (this.listeners.get('onScanResult') !== undefined) {
+      return Promise.reject('scan already in progress');
+    }
+
+    const onScanResultHelper = (resultInternal: ScanResultInternal) => {
+      const result: ScanResult = {
+        ...resultInternal,
+        manufacturerData: convertObject(resultInternal.manufacturerData),
+        serviceData: convertObject(resultInternal.serviceData),
+        rawAdvertisement: resultInternal.rawAdvertisement
+          ? convertValue(resultInternal.rawAdvertisement)
+          : undefined,
+      };
+      onScanResultCallback(result);
+    };
+
+    const listeners = new Map<string, any>([
+      ['onScanResult', { callback: onScanResultHelper, listener: undefined }],
+      ['onConnect', { callback: onConnectCallback, listener: undefined }],
+      ['onDisconnect', { callback: onDisconnectCallback, listener: undefined }],
+    ]);
+
+    listeners.forEach((callbackObj: any, listenerName: string) => {
+      callbackObj.listener = this.eventEmitter!.addListener(listenerName, callbackObj.callback);
+      this.listeners.set(listenerName, callbackObj.listener);
+    });
+
+    NativeModuleBle.requestLEScan(
+      this.removeUndefinedField({
+        services: services,
+        name: name,
+        namePrefix: namePrefix,
+        optionalServices: optionalServices,
+        allowDuplicates: allowDuplicates,
+        scanMode: scanMode,
+        timeout: timeout,
+      }),
     );
 
-    this.listeners.set('onScanResult', listener);
-    this.abrevvaBle.requestLEScan(options);
-    const timeout = options.timeout ? options.timeout : 10000;
-    setTimeout(() => {
-      listener.remove();
-      this.listeners.set('onScanResult', undefined);
-      Promise.resolve();
-    }, timeout + 500);
+    setTimeout(
+      () => {
+        listeners.forEach((callbackObj: any, listenerName: string) => {
+          this.listeners.set(listenerName, undefined);
+          callbackObj.listener.remove();
+        });
+        Promise.resolve();
+      },
+      (timeout ? timeout : 10000) + 500,
+    );
   }
 
   async stopLEScan(): Promise<void> {
-    return await this.abrevvaBle.stopLEScan();
+    return await NativeModuleBle.stopLEScan();
   }
 
   async connect(options: DeviceIdOptions & TimeoutOptions): Promise<void> {
-    return await this.abrevvaBle.connect(options);
+    return await NativeModuleBle.connect(options);
   }
 
   async disconnect(options: DeviceIdOptions): Promise<void> {
-    this.listeners.forEach((listener) => listener?.remove());
+    this.listeners.forEach((listener) => listener?.remove);
     this.listeners = new Map<String, EmitterSubscription | undefined>([
       ['onEnabledChanged', undefined],
       ['onScanResult', undefined],
+      ['onConnect', undefined],
+      ['onDisconnect', undefined],
     ]);
-    this.abrevvaBle.setSupportedEvents({ events: [...this.listeners.keys()] });
-    return await this.abrevvaBle.disconnect(options);
+    NativeModuleBle.setSupportedEvents({ events: [...this.listeners.keys()] });
+    return await NativeModuleBle.disconnect(options);
   }
 
   async read(options: ReadOptions & TimeoutOptions): Promise<ReadResult> {
-    return await this.abrevvaBle.read(options);
+    return await NativeModuleBle.read(options);
   }
 
   async write(options: WriteOptions & TimeoutOptions): Promise<void> {
-    return await this.abrevvaBle.write(options);
+    return await NativeModuleBle.write(options);
   }
 
   async signalize(options: SignalizeOptions): Promise<void> {
-    return await this.abrevvaBle.signalize(options);
+    return await NativeModuleBle.signalize(options);
   }
 
   async disengage(options: DisengageOptions): Promise<StringResult> {
-    return await this.abrevvaBle.disengage(options);
+    return await NativeModuleBle.disengage(options);
   }
 
   async startNotifications(
-    options: ReadOptions,
+    deviceId: string,
+    service: string,
+    characteristic: string,
     callback: (event: ReadResult) => void,
   ): Promise<void> {
     if (this.eventEmitter === undefined) {
       console.error('unsupported platform');
       return;
     }
-    const key =
-      `notification|${options.deviceId}|${options.service}|${options.characteristic}`.toLowerCase();
-    this.listeners.get(key)?.remove();
-    this.listeners.set(key, undefined);
-    this.abrevvaBle.setSupportedEvents({ events: [...this.listeners.keys()] });
-    const listener = this.eventEmitter.addListener(key, (event: any) => {
-      callback(event.value);
-    });
+    const key = `notification|${deviceId}|${service}|${characteristic}`.toLowerCase();
+    const listener = this.eventEmitter.addListener(key, callback);
     this.listeners.set(key, listener);
-    return await this.abrevvaBle.startNotifications(options);
+    await NativeModuleBle.setSupportedEvents({ events: [...this.listeners.keys()] });
+    return await NativeModuleBle.startNotifications(
+      this.removeUndefinedField({
+        deviceId: deviceId,
+        service: service,
+        characteristic: characteristic,
+      }),
+    );
   }
 
   async stopNotifications(options: ReadOptions): Promise<void> {
     const key =
       `notification|${options.deviceId}|${options.service}|${options.characteristic}`.toLowerCase();
     if (key in this.listeners) {
-      this.listeners.get(key)?.remove();
       this.listeners.delete(key);
-      this.abrevvaBle.setSupportedEvents({
+      NativeModuleBle.setSupportedEvents({
         events: [...this.listeners.keys()],
       });
     }
-    return await this.abrevvaBle.stopNotifications(options);
+    return await NativeModuleBle.stopNotifications(options);
   }
 }
 
-export const AbrevvaBle = new BleClient();
+class AbrevvaNfcModule implements AbrevvaNfcInterface {
+  connect() {
+    return NativeModuleNfc.connect();
+  }
+  disconnect() {
+    return NativeModuleNfc.disconnect();
+  }
+  read() {
+    return NativeModuleNfc.read();
+  }
+}
 
-export const AbrevvaNfc = NativeModules.AbrevvaNfc
-  ? NativeModules.AbrevvaNfc
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error('Linking Error AbrevvaNfc');
-        },
-      },
-    );
+class AbrevvaCryptoModule implements AbrevvaCryptoInterface {
+  encrypt(key: string, iv: string, adata: string, pt: string, tagLength?: number) {
+    return NativeModuleCrypto.encrypt({
+      key: key,
+      iv: iv,
+      adata: adata,
+      pt: pt,
+      tagLength: tagLength,
+    });
+  }
+  decrypt(key: string, iv: string, adata: string, ct: string, tagLength?: number) {
+    return NativeModuleCrypto.decrypt({
+      key: key,
+      iv: iv,
+      adata: adata,
+      ct: ct,
+      tagLength: tagLength,
+    });
+  }
+  generateKeyPair() {
+    return NativeModuleCrypto.generateKeyPair();
+  }
 
-export const AbrevvaCrypto = NativeModules.AbrevvaCrypto
-  ? NativeModules.AbrevvaCrypto
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error('Linking Error AbrevvaNfc');
-        },
-      },
-    );
+  computeSharedSecret(key: string, peerPublicKey: string) {
+    return NativeModuleCrypto.computeSharedSecret({ key: key, peerPublicKey: peerPublicKey });
+  }
+
+  encryptFile(sharedSecret: string, ptPath: string, ctPath: string) {
+    return NativeModuleCrypto.encrypt({
+      sharedSecret: sharedSecret,
+      ptPath: ptPath,
+      ctPath: ctPath,
+    });
+  }
+
+  decryptFile(sharedSecret: string, ptPath: string, ctPath: string) {
+    return NativeModuleCrypto.decryptFile({
+      sharedSecret: sharedSecret,
+      ptPath: ptPath,
+      ctPath: ctPath,
+    });
+  }
+
+  decryptFileFromURL(sharedSecret: string, ptPath: string, url: string) {
+    return NativeModuleCrypto.decryptFileFromURL({
+      sharedSecret: sharedSecret,
+      ptPath: ptPath,
+      url: url,
+    });
+  }
+
+  random(numBytes: number) {
+    return NativeModuleCrypto.random({ numBytes: numBytes });
+  }
+
+  derive(key: string, salt: string, info: string, length: number) {
+    return NativeModuleCrypto.derive({ key: key, salt: salt, info: info, length: length });
+  }
+}
+
+export const AbrevvaBle = new AbrevvaBleModule();
+export const AbrevvaCrypto = new AbrevvaCryptoModule();
+export const AbrevvaNfc = new AbrevvaNfcModule();
diff --git a/src/interfaces.tsx b/src/interfaces.tsx
index e0f473f..5b2aec6 100644
--- a/src/interfaces.tsx
+++ b/src/interfaces.tsx
@@ -1,7 +1,3 @@
-export interface InitializeOptions {
-  androidNeverForLocation?: boolean;
-}
-
 export enum ScanMode {
   SCAN_MODE_LOW_POWER = 0,
   SCAN_MODE_BALANCED = 1,
@@ -92,3 +88,68 @@ export interface DisengageOptions {
   mobileAccessData: string;
   isPermanentRelease: boolean;
 }
+
+export interface AbrevvaNfcInterface {
+  connect: () => Promise<void>;
+  disconnect: () => Promise<void>;
+  read: () => Promise<void>;
+}
+export interface AbrevvaCryptoInterface {
+  encrypt: (
+    key: string,
+    iv: string,
+    adata: string,
+    pt: string,
+    tagLength?: number,
+  ) => Promise<Object>;
+  decrypt: (
+    key: string,
+    iv: string,
+    adata: string,
+    ct: string,
+    tagLength?: number,
+  ) => Promise<Object>;
+  generateKeyPair: () => Promise<Object>;
+  computeSharedSecret: (key: string, peerPublicKey: string) => Promise<Object>;
+  encryptFile: (sharedSecret: string, ptPath: string, ctPath: string) => Promise<Object>;
+  decryptFile: (sharedSecret: string, ptPath: string, ctPath: string) => Promise<Object>;
+  decryptFileFromURL: (sharedSecret: string, ptPath: string, url: string) => Promise<Object>;
+  random: (numBytes: number) => Promise<Object>;
+  derive: (key: string, salt: string, info: string, length: number) => Promise<Object>;
+}
+export interface AbrevvaBLEInterface {
+  initialize(androidNeverForLocation?: boolean): Promise<void>;
+  isEnabled(): Promise<boolean>;
+  isLocationEnabled(): Promise<boolean>;
+  startEnabledNotifications(callback: (result: boolean) => void): Promise<void>;
+  stopEnabledNotifications(): Promise<void>;
+  openLocationSettings(): Promise<void>;
+  openBluetoothSettings(): Promise<void>;
+  openAppSettings(): Promise<void>;
+  requestLEScan(
+    onScanResultCallback: (result: ScanResult) => void,
+    onConnectCallback: (address: string) => void,
+    onDisconnectCallback: (address: string) => void,
+    services?: string[],
+    name?: string,
+    namePrefix?: string,
+    optionalServices?: string[],
+    allowDuplicates?: boolean,
+    scanMode?: ScanMode,
+    timeout?: number,
+  ): Promise<void>;
+  stopLEScan(): Promise<void>;
+  connect(options: DeviceIdOptions & TimeoutOptions): Promise<void>;
+  disconnect(options: DeviceIdOptions): Promise<void>;
+  read(options: ReadOptions & TimeoutOptions): Promise<ReadResult>;
+  write(options: WriteOptions & TimeoutOptions): Promise<void>;
+  signalize(options: SignalizeOptions): Promise<void>;
+  disengage(options: DisengageOptions): Promise<StringResult>;
+  startNotifications(
+    deviceId: string,
+    service: string,
+    characteristic: string,
+    callback: (event: ReadResult) => void,
+  ): Promise<void>;
+  stopNotifications(options: ReadOptions): Promise<void>;
+}