diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f89ac9..6dae4460 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,16 @@
 ## 7.0.0
 ### BREAKING CHANGE
-Call the `FlutterBranchSdk.init` method to initialize the SDK.
-Initialization must be called from `main` or at any time, for example after getting consent for GPDR.
+1. Call the `FlutterBranchSdk.init()` method to initialize the SDK. 
 
-The `init` method has optional parameters that allow you:
+	Initialization must be called from `main` or at any time, for example after getting consent for GPDR.
 
-- change from test to live mode
-- enable logging
-- disable tracking to comply with GDPR.
+	The `init` method has optional parameters that allow you:
 
+	- change from test to live mode
+	- enable logging
+	- disable tracking to comply with GDPR.
+
+2.`initSession` deprecated. Use `listSession`
  
 ### Enhancement
 * Updated compile & target SDK to Android API 33.
diff --git a/README.md b/README.md
index ae350004..4f374d74 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,8 @@ Follow the steps on the page [https://help.branch.io/developers-hub/docs/android
 
 * Add Branch to your `AndroidManifest.xml`
 
+--
+
 ### iOS Integration
 Follow the steps on the page [https://help.branch.io/developers-hub/docs/ios-basic-integration#configure-bundle-identifier](https://help.branch.io/developers-hub/docs/ios-basic-integration#configure-bundle-identifier), from session ```Configure bundle identifier```:
 
@@ -54,6 +56,15 @@ Follow the steps on the page [https://help.branch.io/developers-hub/docs/ios-bas
 * Configure associated domains
 * Configure Info.plist
 
+#### NativeLink™ Deferred Deep Linking
+Use iOS pasteboard to enable deferred deep linking via Branch NativeLink™, which enables 100% matching on iOS through Installs.
+
+Follow the steps on the [page](https://help.branch.io/developers-hub/docs/ios-advanced-features#nativelink-deferred-deep-linking), session _**NativeLink™ Deferred Deep Linking**_,
+
+Note: Code implementation in Swift is not necessary. The plugin already implements the code, requiring only configuration on the Dashboard.
+
+--
+
 ### Web Integration
 
 You need add Branch Javascript in your `web\index.html` at the top of your `<body>` tag, to be able to use this package.
@@ -64,7 +75,7 @@ You need add Branch Javascript in your `web\index.html` at the top of your `<bod
     branch.init('key_live_or_test_YOUR_KEY_GOES_HERE');
   </script>
 ```
-Change `key_live_YOUR_KEY_GOES_HERE` to match your [Branch Dashboard](https://dashboard.branch.io/account-settings/app)
+Change `key_live_or_test_YOUR_KEY_GOES_HERE ` to match your [Branch Dashboard](https://dashboard.branch.io/account-settings/app)
 
 If `branch.init()` fails, all subsequent Branch methods will fail.
 
@@ -105,7 +116,7 @@ Full example `index.html`:
 <body>
   <script>
     (function(b,r,a,n,c,h,_,s,d,k){if(!b[n]||!b[n]._q){for(;s<_.length;)c(h,_[s++]);d=r.createElement(a);d.async=1;d.src="https://cdn.branch.io/branch-latest.min.js";k=r.getElementsByTagName(a)[0];k.parentNode.insertBefore(d,k);b[n]=h}})(window,document,"script","branch",function(b,r){b[r]=function(){b._q.push([r,arguments])}},{_q:[],_v:1},"addListener applyCode autoAppIndex banner closeBanner closeJourney creditHistory credits data deepview deepviewCta first getCode init link logout redeem referrals removeListener sendSMS setBranchViewData setIdentity track validateCode trackCommerceEvent logEvent disableTracking".split(" "), 0);
-    branch.init('key_live_YOUR_KEY_GOES_HERE');
+    branch.init('key_live_or_test_YOUR_KEY_GOES_HERE');
   </script>
   <!-- This script installs service_worker.js to provide PWA functionality to
        application. For more information, see:
@@ -137,10 +148,12 @@ import 'package:flutter_branch_sdk/flutter_branch_sdk.dart';
 
 BranchSdk.init(); 
 ///options:
+/// default false for all options
 /// [useTestKey] - Sets `true` to use the test `key_test_...
 /// [enableLogging] - Sets `true` turn on debug logging
 /// [disableTracking] - Sets `true` to disable tracking in Branch SDK for GDPR compliant on start. After having consent, sets `false`
 /// [enableFacebookLinkCheck] - Sets `true` to enable Facebook app link check operation during Branch initialisation  
+
 ```
 
 Initialization must be called from `main` or at any time, for example after getting consent for GPDR.
@@ -202,7 +215,7 @@ Make sure to comment out or remove `validateSDKIntegration` in your production b
 To listen to the clicks on the deep link and retrieve the data it is necessary to add the code below:
 
 ```dart
-    StreamSubscription<Map> streamSubscription = FlutterBranchSdk.listSession().listen((data) {
+    StreamSubscription<Map> streamSubscription = FlutterBranchSdk.listSession().listen((data)  {
       if (data.containsKey("+clicked_branch_link") &&
           data["+clicked_branch_link"] == true) {
          //Link clicked. Add logic to get link data
@@ -222,7 +235,10 @@ If you ever want to access the original session params (the parameters passed in
     Map<dynamic, dynamic> params = await FlutterBranchSdk.getFirstReferringParams();
 ```
 
+*Note: You must call this method on `iOS` to obtain installation data if the return of the `FlutterBranchSdk.listSession()` function is {+is_first_session: true, +clicked_branch_link: false}*
+
 ### Retrieve session (install or open) parameters
+
 These session parameters will be available at any point later on with this command. If no parameters are available then Branch will return an empty dictionary. This refreshes with every new session (app installs AND app opens).
 
 ```dart
@@ -601,45 +617,6 @@ print(status);
 See: [https://developer.apple.com/documentation/adsupport/asidentifiermanager/1614151-advertisingidentifier](https://developer.apple.com/documentation/adsupport/asidentifiermanager/1614151-advertisingidentifier)
 
 
-### Enable Logging
-Use the Branch test key instead of the live key.
-
-Logging is enabled by default in debug mode and disabled in release mode.
-
-To enable/disable logging update `INFO.PLIST` on `iOS` or `AndroidManifest.xml` on Android:
-
-For `iOS` add to `INFO.PLIST`:
-
-To disable:
-
-```swift
-	<key>branch_enable_log</key>
-	<false/>
-```
-
-To enable:
-
-```swift
-	<key>branch_enable_log</key>
-	<true/>
-```
-
-For `Android` add to `AndroidManifest.xml`:
-
-To disable:
-
-```java
-    <meta-data android:name="branch_enable_log"
-        android:value="false" />
-```
-
-To enable:
-
-```java
-    <meta-data android:name="branch_enable_log"
-        android:value="true" />
-```
-
 ### Facebook App Install Ads
 
 Branch links can be used together with Facebook App Install Campaign ads, allowing you to track ad-driven installs on the Branch dashboard and deep link those new users directly to content the first time they open your app.
@@ -647,29 +624,20 @@ Branch links can be used together with Facebook App Install Campaign ads, allowi
 Follow the instructions on the link
 <a href="https://help.branch.io/using-branch/docs/facebook-app-install-ads" target="_blank">https://help.branch.io/using-branch/docs/facebook-app-install-ads</a>.
 
-To read Facebook App Install deep links update `INFO.PLIST` on `iOS` or `AndroidManifest.xml` on `Android` as in the example:
-
-For `iOS` add to `INFO.PLIST`:
+To read Facebook App Install deep links, when initializing the SDK, in the `FlutterBranchSdk.init()` method, enter the parameter `enableFacebookLinkCheck` = true.
 
-```swift
-	<key>branch_enable_facebook_ads</key>
-	<true/>
+```dart
+await FlutterBranchSdk.init(enableFacebookLinkCheck: true);
 ```
-** Deprecated on version 6.8.0 **
-For `Android` add to `AndroidManifest.xml`:
 
-```java
-    <meta-data android:name="branch_enable_facebook_ads"
-        android:value="true" />
-```
 
 Follow the instructions to  install Facebook Android / iOS SDK:
 
-`iOS`: 
+- `iOS`: 
 
 <a href="https://developers.facebook.com/docs/ios/use-cocoapods" target="_blank">https://developers.facebook.com/docs/ios/use-cocoapods</a>
 
-`Android`: 
+- `Android`: (**Deprecated on version 6.8.0**)
 
 <a href="https://developers.facebook.com/docs/android/getting-started" target="_blank">https://developers.facebook.com/docs/android/getting-started</a>
 
diff --git a/android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java b/android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java
index 349a51b0..d417f09e 100644
--- a/android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java
+++ b/android/src/main/java/br/com/rsmarques/flutter_branch_sdk/FlutterBranchSdkPlugin.java
@@ -61,9 +61,12 @@ public class FlutterBranchSdkPlugin implements FlutterPlugin, MethodCallHandler,
     private boolean isInitialized = false;
 
     private final JSONObject requestMetadata = new JSONObject();
-    //private final JSONObject installMetadata = new JSONObject();
     private final JSONObject facebookParameters = new JSONObject();
-    private  Intent initialIntent = null;
+    private final JSONObject snapParameters = new JSONObject();
+    private final ArrayList<String> preInstallParameters = new ArrayList<String>();
+    private final ArrayList<String> campaingParameters = new ArrayList<String>();
+    private Intent initialIntent = null;
+
     /**
      * ---------------------------------------------------------------------------------------------
      * Plugin registry
@@ -336,626 +339,622 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result rawResult) {
         }
     }
 
-        /**
-         * ---------------------------------------------------------------------------------------------
-         * Branch SDK Call Methods
-         * --------------------------------------------------------------------------------------------
-         **/
-        private final Branch.BranchReferralInitListener branchReferralInitListener = new
-                Branch.BranchReferralInitListener() {
-                    @Override
-                    public void onInitFinished(JSONObject params, BranchError error) {
-                        LogUtils.debug(DEBUG_NAME, "onInitFinished - call");
-                        if (error == null) {
-                            LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - params: " + params.toString());
-                            try {
-                                sessionParams = branchSdkHelper.paramsToMap(params);
-                            } catch (JSONException e) {
-                                LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error to Map: " + e.getLocalizedMessage());
-                                return;
-                            }
-                            if (eventSink != null) {
-                                eventSink.success(sessionParams);
-                                sessionParams = null;
-                            }
+    /**
+     * ---------------------------------------------------------------------------------------------
+     * Branch SDK Call Methods
+     * --------------------------------------------------------------------------------------------
+     **/
+    private final Branch.BranchReferralInitListener branchReferralInitListener = new
+            Branch.BranchReferralInitListener() {
+                @Override
+                public void onInitFinished(JSONObject params, BranchError error) {
+                    LogUtils.debug(DEBUG_NAME, "onInitFinished - call");
+                    if (error == null) {
+                        LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - params: " + params.toString());
+                        try {
+                            sessionParams = branchSdkHelper.paramsToMap(params);
+                        } catch (JSONException e) {
+                            LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error to Map: " + e.getLocalizedMessage());
+                            return;
+                        }
+                        if (eventSink != null) {
+                            eventSink.success(sessionParams);
+                            sessionParams = null;
+                        }
+                    } else {
+                        //if (error.getErrorCode() == BranchError.ERR_BRANCH_ALREADY_INITIALIZED || error.getErrorCode() == BranchError.ERR_IMPROPER_REINITIALIZATION) {
+                        //    LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error: ERR_BRANCH_ALREADY_INITIALIZED");
+                        //    return;
+                        //}
+                        LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error: " + error);
+                        if (eventSink != null) {
+                            eventSink.error(String.valueOf(error.getErrorCode()), error.getMessage(), null);
+                            initialError = null;
                         } else {
-                            //if (error.getErrorCode() == BranchError.ERR_BRANCH_ALREADY_INITIALIZED || error.getErrorCode() == BranchError.ERR_IMPROPER_REINITIALIZATION) {
-                            //    LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error: ERR_BRANCH_ALREADY_INITIALIZED");
-                            //    return;
-                            //}
-                            LogUtils.debug(DEBUG_NAME, "BranchReferralInitListener - error: " + error);
-                            if (eventSink != null) {
-                                eventSink.error(String.valueOf(error.getErrorCode()), error.getMessage(), null);
-                                initialError = null;
-                            } else {
-                                initialError = error;
-                            }
+                            initialError = error;
                         }
                     }
-                };
-
-        private void setupBranch (MethodCall call,final Result result){
-            LogUtils.debug(DEBUG_NAME, "setupBranch call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-
-            if (isInitialized) {
-                result.success(Boolean.TRUE);
-            }
-
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+                }
+            };
 
-            if ((Boolean) argsMap.get("useTestKey")) {
-                Branch.enableTestMode();
+    private void setupBranch(MethodCall call, final Result result) {
+        LogUtils.debug(DEBUG_NAME, "setupBranch call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        if (isInitialized) {
+            result.success(Boolean.TRUE);
+        }
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        if ((Boolean) argsMap.get("useTestKey")) {
+            Branch.enableTestMode();
+        }
+        if (BuildConfig.DEBUG) {
+            if ((Boolean) argsMap.get("enableLogging")) {
+                Branch.enableLogging();
             }
+        }
+        Branch.registerPlugin(PLUGIN_NAME, (String) argsMap.get("version"));
+        Branch.getAutoInstance(this.context);
+        isInitialized = true;
 
-            if (BuildConfig.DEBUG) {
-                if ((Boolean) argsMap.get("enableLogging")) {
-                    Branch.enableLogging();
+        if (requestMetadata.length() > 0) {
+            Iterator keys = requestMetadata.keys();
+            while (keys.hasNext()) {
+                String key = (String) keys.next();
+                try {
+                    Branch.getInstance().setRequestMetadata(key, requestMetadata.getString(key));
+                } catch (JSONException e) {
+                    // no-op
                 }
             }
-
-            Branch.registerPlugin(PLUGIN_NAME, (String) argsMap.get("version"));
-            Branch.getAutoInstance(this.context);
-            isInitialized = true;
-
-            if (requestMetadata != null) {
-                Iterator keys = requestMetadata.keys();
-                while (keys.hasNext()) {
-                    String key = (String) keys.next();
-                    try {
-                        Branch.getInstance().setRequestMetadata(key, requestMetadata.getString(key));
-                    } catch (JSONException e) {
-                        // no-op
-                    }
+        }
+        if (facebookParameters.length() > 0) {
+            Iterator keys = facebookParameters.keys();
+            while (keys.hasNext()) {
+                String key = (String) keys.next();
+                try {
+                    Branch.getInstance().addFacebookPartnerParameterWithName(key, facebookParameters.getString(key));
+                } catch (JSONException e) {
+                    // no-op
                 }
             }
-
-            if (facebookParameters != null) {
-                Iterator keys = facebookParameters.keys();
-                while (keys.hasNext()) {
-                    String key = (String) keys.next();
-                    try {
-                        Branch.getInstance().addFacebookPartnerParameterWithName(key, requestMetadata.getString(key));
-                    } catch (JSONException e) {
-                        // no-op
-                    }
+        }
+        if (snapParameters.length() > 0) {
+            Iterator keys = snapParameters.keys();
+            while (keys.hasNext()) {
+                String key = (String) keys.next();
+                try {
+                    Branch.getInstance().addSnapPartnerParameterWithName(key, snapParameters.getString(key));
+                } catch (JSONException e) {
+                    // no-op
                 }
             }
-
-            if ((Boolean) argsMap.get("disableTracking")) {
-                Branch.getInstance().disableTracking(true);
-            }
-
-            this.context.startActivity(initialIntent);
-            result.success(Boolean.TRUE);
         }
-
-        private void validateSDKIntegration () {
-            IntegrationValidator.validate(activity);
+        if (!preInstallParameters.isEmpty()) {
+            for (int i = 0; i < preInstallParameters.size(); i++) {
+                Branch.getAutoInstance(context).setPreinstallPartner(preInstallParameters.get(i));
+            }
         }
-
-        private void getShortUrl (MethodCall call,final Result result){
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        if (!campaingParameters.isEmpty()) {
+            for (int i = 0; i < campaingParameters.size(); i++) {
+                Branch.getAutoInstance(context).setPreinstallCampaign(campaingParameters.get(i));
             }
+        }
+        if ((Boolean) argsMap.get("disableTracking")) {
+            Branch.getInstance().disableTracking(true);
+        }
+        this.context.startActivity(initialIntent);
+        result.success(Boolean.TRUE);
+    }
 
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-            BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-
-            LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-
-            final Map<String, Object> response = new HashMap<>();
-
-            buo.generateShortUrl(activity, linkProperties, new Branch.BranchLinkCreateListener() {
-                @Override
-                public void onLinkCreate(String url, BranchError error) {
+    private void validateSDKIntegration() {
+        IntegrationValidator.validate(activity);
+    }
 
-                    if ((error == null) || (error != null && url != null)) {
-                        LogUtils.debug(DEBUG_NAME, "Branch link to share: " + url);
-                        response.put("success", true);
-                        response.put("url", url);
-                    } else {
-                        response.put("success", false);
-                        response.put("errorCode", String.valueOf(error.getErrorCode()));
-                        response.put("errorMessage", error.getMessage());
-                    }
-                    result.success(response);
+    private void getShortUrl(MethodCall call, final Result result) {
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
+        final Map<String, Object> response = new HashMap<>();
+        buo.generateShortUrl(activity, linkProperties, new Branch.BranchLinkCreateListener() {
+            @Override
+            public void onLinkCreate(String url, BranchError error) {
+
+                if ((error == null) || (error != null && url != null)) {
+                    LogUtils.debug(DEBUG_NAME, "Branch link to share: " + url);
+                    response.put("success", true);
+                    response.put("url", url);
+                } else {
+                    response.put("success", false);
+                    response.put("errorCode", String.valueOf(error.getErrorCode()));
+                    response.put("errorMessage", error.getMessage());
                 }
-            });
-        }
-
-        private void showShareSheet (MethodCall call,final Result result){
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+                result.success(response);
             }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-            BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-
-            LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-            String messageText = (String) argsMap.get("messageText");
-            String messageTitle = (String) argsMap.get("messageTitle");
-            String sharingTitle = (String) argsMap.get("sharingTitle");
-
-            final Map<String, Object> response = new HashMap<>();
+        });
+    }
 
-            ShareSheetStyle shareSheetStyle = new ShareSheetStyle(activity, messageTitle, messageText)
-                    .setAsFullWidthStyle(true)
-                    .setSharingTitle(sharingTitle);
+    private void showShareSheet(MethodCall call, final Result result) {
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
+        String messageText = (String) argsMap.get("messageText");
+        String messageTitle = (String) argsMap.get("messageTitle");
+        String sharingTitle = (String) argsMap.get("sharingTitle");
+        final Map<String, Object> response = new HashMap<>();
+        ShareSheetStyle shareSheetStyle = new ShareSheetStyle(activity, messageTitle, messageText)
+                .setAsFullWidthStyle(true)
+                .setSharingTitle(sharingTitle);
+        buo.showShareSheet(activity,
+                linkProperties,
+                shareSheetStyle,
+                new Branch.ExtendedBranchLinkShareListener() {
+                    @Override
+                    public void onShareLinkDialogLaunched() {
+                    }
 
-            buo.showShareSheet(activity,
-                    linkProperties,
-                    shareSheetStyle,
-                    new Branch.ExtendedBranchLinkShareListener() {
-                        @Override
-                        public void onShareLinkDialogLaunched() {
-                        }
+                    @Override
+                    public void onShareLinkDialogDismissed() {
+                    }
 
-                        @Override
-                        public void onShareLinkDialogDismissed() {
+                    @Override
+                    public void onLinkShareResponse(String sharedLink, String sharedChannel, BranchError error) {
+                        if (error == null) {
+                            LogUtils.debug(DEBUG_NAME, "Branch link share: " + sharedLink);
+                            response.put("success", Boolean.TRUE);
+                            response.put("url", sharedLink);
+                        } else {
+                            response.put("success", Boolean.FALSE);
+                            response.put("errorCode", String.valueOf(error.getErrorCode()));
+                            response.put("errorMessage", error.getMessage());
                         }
+                        result.success(response);
+                    }
 
-                        @Override
-                        public void onLinkShareResponse(String sharedLink, String sharedChannel, BranchError error) {
-                            if (error == null) {
-                                LogUtils.debug(DEBUG_NAME, "Branch link share: " + sharedLink);
-                                response.put("success", Boolean.TRUE);
-                                response.put("url", sharedLink);
-                            } else {
-                                response.put("success", Boolean.FALSE);
-                                response.put("errorCode", String.valueOf(error.getErrorCode()));
-                                response.put("errorMessage", error.getMessage());
-                            }
-                            result.success(response);
-                        }
+                    @Override
+                    public void onChannelSelected(String channelName) {
 
-                        @Override
-                        public void onChannelSelected(String channelName) {
+                    }
 
-                        }
+                    @Override
+                    public boolean onChannelSelected(String channelName, BranchUniversalObject buo, LinkProperties linkProperties) {
+                        return false;
+                    }
+                });
+    }
 
-                        @Override
-                        public boolean onChannelSelected(String channelName, BranchUniversalObject buo, LinkProperties linkProperties) {
-                            return false;
-                        }
-                    });
+    private void registerView(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "registerView call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void registerView (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "registerView call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        final BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                buo.registerView();
             }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-            final BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    buo.registerView();
-                }
-            });
+    private void listOnSearch(MethodCall call, Result result) {
+        LogUtils.debug(DEBUG_NAME, "listOnSearch call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void listOnSearch (MethodCall call, Result result){
-            LogUtils.debug(DEBUG_NAME, "listOnSearch call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-            BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-            if (argsMap.containsKey("lp")) {
-                LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-                //buo.listOnGoogleSearch(context, linkProperties);
-            } else {
-                //buo.listOnGoogleSearch(context);
-            }
-            result.success(Boolean.TRUE);
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        if (argsMap.containsKey("lp")) {
+            LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
+            //buo.listOnGoogleSearch(context, linkProperties);
+        } else {
+            //buo.listOnGoogleSearch(context);
         }
+        result.success(Boolean.TRUE);
+    }
 
-        private void removeFromSearch (MethodCall call, Result result){
-            LogUtils.debug(DEBUG_NAME, "removeFromSearch call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-            BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-            if (argsMap.containsKey("lp")) {
-                LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-                //buo.removeFromLocalIndexing(context, linkProperties);
-            } else {
-                //buo.removeFromLocalIndexing(context);
-            }
-            result.success(Boolean.TRUE);
+    private void removeFromSearch(MethodCall call, Result result) {
+        LogUtils.debug(DEBUG_NAME, "removeFromSearch call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        if (argsMap.containsKey("lp")) {
+            LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
+            //buo.removeFromLocalIndexing(context, linkProperties);
+        } else {
+            //buo.removeFromLocalIndexing(context);
+        }
+        result.success(Boolean.TRUE);
+    }
 
-        private void trackContent (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "trackContent call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-
-            final List<BranchUniversalObject> buo = new ArrayList();
-            for (HashMap<String, Object> b : (List<HashMap<String, Object>>) argsMap.get("buo")) {
-                buo.add(branchSdkHelper.convertToBUO(b));
+    private void trackContent(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "trackContent call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        final List<BranchUniversalObject> buo = new ArrayList();
+        for (HashMap<String, Object> b : (List<HashMap<String, Object>>) argsMap.get("buo")) {
+            buo.add(branchSdkHelper.convertToBUO(b));
+        }
+        final BranchEvent event = branchSdkHelper.convertToEvent((HashMap<String, Object>) argsMap.get("event"));
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                event.addContentItems(buo).logEvent(context);
             }
-            final BranchEvent event = branchSdkHelper.convertToEvent((HashMap<String, Object>) argsMap.get("event"));
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    event.addContentItems(buo).logEvent(context);
-                }
-            });
+    private void trackContentWithoutBuo(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "trackContentWithoutBuo call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void trackContentWithoutBuo (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "trackContentWithoutBuo call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        final BranchEvent event = branchSdkHelper.convertToEvent((HashMap<String, Object>) argsMap.get("event"));
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                event.logEvent(context);
             }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-            final BranchEvent event = branchSdkHelper.convertToEvent((HashMap<String, Object>) argsMap.get("event"));
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    event.logEvent(context);
-                }
-            });
+    private void setIdentity(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setIdentity call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void setIdentity (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setIdentity call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final String userId = call.argument("userId");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().setIdentity(userId);
             }
-            final String userId = call.argument("userId");
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().setIdentity(userId);
+    private void setRequestMetadata(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setRequestMetadata call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        final String key = call.argument("key");
+        final String value = call.argument("value");
+        if (!isInitialized) {
+            if (requestMetadata.has(key) && value.isEmpty()) {
+                requestMetadata.remove(key);
+            } else {
+                try {
+                    requestMetadata.put(key, value);
+                } catch (JSONException error) {
                 }
-            });
+            }
+            return;
         }
-
-        private void setRequestMetadata (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setRequestMetadata call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().setRequestMetadata(key, value);
             }
-            final String key = call.argument("key");
-            final String value = call.argument("value");
+        });
+    }
 
-            if (!isInitialized) {
-                if (requestMetadata.has(key) && value.isEmpty()) {
-                    requestMetadata.remove(key);
-                } else {
-                    try {
-                        requestMetadata.put(key, value);
-                    } catch (JSONException error) {
-                    }
-                }
-                return;
+    private void logout() {
+        LogUtils.debug(DEBUG_NAME, "logout call");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().logout();
             }
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().setRequestMetadata(key, value);
-                }
-            });        }
-
-        private void logout () {
-            LogUtils.debug(DEBUG_NAME, "logout call");
-
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().logout();
-                }
-            });
+    private void getLatestReferringParams(Result result) {
+        LogUtils.debug(DEBUG_NAME, "getLatestReferringParams call");
+        JSONObject sessionParams = Branch.getInstance().getLatestReferringParams();
+        try {
+            result.success(branchSdkHelper.paramsToMap(sessionParams));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            result.error(DEBUG_NAME, e.getMessage(), null);
         }
+    }
 
-        private void getLatestReferringParams (Result result){
-            LogUtils.debug(DEBUG_NAME, "getLatestReferringParams call");
-            JSONObject sessionParams = Branch.getInstance().getLatestReferringParams();
-            try {
-                result.success(branchSdkHelper.paramsToMap(sessionParams));
-            } catch (JSONException e) {
-                e.printStackTrace();
-                result.error(DEBUG_NAME, e.getMessage(), null);
-            }
+    private void getFirstReferringParams(Result result) {
+        LogUtils.debug(DEBUG_NAME, "getFirstReferringParams call");
+        JSONObject sessionParams = Branch.getInstance().getFirstReferringParams();
+        try {
+            result.success(branchSdkHelper.paramsToMap(sessionParams));
+        } catch (JSONException e) {
+            e.printStackTrace();
+            result.error(DEBUG_NAME, e.getMessage(), null);
         }
+    }
 
-        private void getFirstReferringParams (Result result){
-            LogUtils.debug(DEBUG_NAME, "getFirstReferringParams call");
-            JSONObject sessionParams = Branch.getInstance().getFirstReferringParams();
-            try {
-                result.success(branchSdkHelper.paramsToMap(sessionParams));
-            } catch (JSONException e) {
-                e.printStackTrace();
-                result.error(DEBUG_NAME, e.getMessage(), null);
-            }
+    private void setTrackingDisabled(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setTrackingDisabled call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void setTrackingDisabled (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setTrackingDisabled call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final boolean value = call.argument("disable");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().disableTracking(value);
             }
-            final boolean value = call.argument("disable");
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().disableTracking(value);
-                }
-            });
-        }
+    private void isUserIdentified(Result result) {
+        LogUtils.debug(DEBUG_NAME, "isUserIdentified call");
+        result.success(Branch.getInstance().isUserIdentified());
+    }
 
-        private void isUserIdentified (Result result){
-            LogUtils.debug(DEBUG_NAME, "isUserIdentified call");
-            result.success(Branch.getInstance().isUserIdentified());
+    private void setConnectTimeout(final MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setConnectTimeout call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void setConnectTimeout ( final MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setConnectTimeout call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final int value = call.argument("connectTimeout");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().setNetworkConnectTimeout(value);
             }
-            final int value = call.argument("connectTimeout");
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().setNetworkConnectTimeout(value);
-                }
-            });
+    private void setTimeout(final MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setConnectTimeout call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void setTimeout ( final MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setConnectTimeout call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final int value = call.argument("timeout");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().setNetworkTimeout(value);
             }
-            final int value = call.argument("timeout");
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().setNetworkTimeout(value);
-                }
-            });
+    private void setRetryCount(final MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setRetryCount call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void setRetryCount ( final MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setRetryCount call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final int value = call.argument("retryCount");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().setRetryCount(value);
             }
-            final int value = call.argument("retryCount");
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().setRetryCount(value);
-                }
-            });
+    private void setRetryInterval(final MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setRetryInterval call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-
-        private void setRetryInterval ( final MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setRetryInterval call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final int value = call.argument("retryInterval");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getInstance().setRetryInterval(value);
             }
-            final int value = call.argument("retryInterval");
-
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getInstance().setRetryInterval(value);
-                }
-            });
-        }
+        });
+    }
 
-        private void getLastAttributedTouchData ( final MethodCall call, final Result result){
-            LogUtils.debug(DEBUG_NAME, "getLastAttributedTouchData call");
-
-            final Map<String, Object> response = new HashMap<>();
-
-            if (call.hasArgument("attributionWindow")) {
-                final int attributionWindow = call.argument("attributionWindow");
-                Branch.getInstance().getLastAttributedTouchData(
-                        new ServerRequestGetLATD.BranchLastAttributedTouchDataListener() {
-                            @Override
-                            public void onDataFetched(JSONObject jsonObject, BranchError error) {
-                                if (error == null) {
-                                    response.put("success", Boolean.TRUE);
-                                    JSONObject jo = new JSONObject();
-                                    try {
-                                        jo.put("latd", jsonObject);
-                                        response.put("data", branchSdkHelper.paramsToMap(jo));
-                                    } catch (JSONException e) {
-                                        e.printStackTrace();
-                                    }
-                                } else {
-                                    response.put("success", Boolean.FALSE);
-                                    response.put("errorCode", String.valueOf(error.getErrorCode()));
-                                    response.put("errorMessage", error.getMessage());
+    private void getLastAttributedTouchData(final MethodCall call, final Result result) {
+        LogUtils.debug(DEBUG_NAME, "getLastAttributedTouchData call");
+        final Map<String, Object> response = new HashMap<>();
+        if (call.hasArgument("attributionWindow")) {
+            final int attributionWindow = call.argument("attributionWindow");
+            Branch.getInstance().getLastAttributedTouchData(
+                    new ServerRequestGetLATD.BranchLastAttributedTouchDataListener() {
+                        @Override
+                        public void onDataFetched(JSONObject jsonObject, BranchError error) {
+                            if (error == null) {
+                                response.put("success", Boolean.TRUE);
+                                JSONObject jo = new JSONObject();
+                                try {
+                                    jo.put("latd", jsonObject);
+                                    response.put("data", branchSdkHelper.paramsToMap(jo));
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
                                 }
-                                result.success(response);
+                            } else {
+                                response.put("success", Boolean.FALSE);
+                                response.put("errorCode", String.valueOf(error.getErrorCode()));
+                                response.put("errorMessage", error.getMessage());
                             }
-                        }, attributionWindow);
+                            result.success(response);
+                        }
+                    }, attributionWindow);
 
-            } else {
-                Branch.getInstance().getLastAttributedTouchData(
-                        new ServerRequestGetLATD.BranchLastAttributedTouchDataListener() {
-                            @Override
-                            public void onDataFetched(JSONObject jsonObject, BranchError error) {
-                                if (error == null) {
-                                    response.put("success", Boolean.TRUE);
-                                    JSONObject jo = new JSONObject();
-                                    try {
-                                        jo.put("latd", jsonObject);
-                                        response.put("data", branchSdkHelper.paramsToMap(jo));
-                                    } catch (JSONException e) {
-                                        e.printStackTrace();
-                                    }
-                                } else {
-                                    response.put("success", Boolean.FALSE);
-                                    response.put("errorCode", String.valueOf(error.getErrorCode()));
-                                    response.put("errorMessage", error.getMessage());
+        } else {
+            Branch.getInstance().getLastAttributedTouchData(
+                    new ServerRequestGetLATD.BranchLastAttributedTouchDataListener() {
+                        @Override
+                        public void onDataFetched(JSONObject jsonObject, BranchError error) {
+                            if (error == null) {
+                                response.put("success", Boolean.TRUE);
+                                JSONObject jo = new JSONObject();
+                                try {
+                                    jo.put("latd", jsonObject);
+                                    response.put("data", branchSdkHelper.paramsToMap(jo));
+                                } catch (JSONException e) {
+                                    e.printStackTrace();
                                 }
-                                result.success(response);
+                            } else {
+                                response.put("success", Boolean.FALSE);
+                                response.put("errorCode", String.valueOf(error.getErrorCode()));
+                                response.put("errorMessage", error.getMessage());
                             }
-                        });
-            }
-        }
-
-        private void getQRCode ( final MethodCall call, final Result result){
-
-            LogUtils.debug(DEBUG_NAME, "getQRCodeAsData call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-            HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
-
-            final BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
-            final LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
-            final BranchQRCode branchQRCode = branchSdkHelper.convertToQRCode((HashMap<String, Object>) argsMap.get("qrCodeSettings"));
-            final Map<String, Object> response = new HashMap<>();
-
-
-            try {
-                branchQRCode.getQRCodeAsData(context, buo, linkProperties, new BranchQRCode.BranchQRCodeDataHandler() {
-                    @Override
-                    public void onSuccess(byte[] qrCodeData) {
-
-                        response.put("success", Boolean.TRUE);
-                        response.put("result", qrCodeData);
-                        result.success(response);
-                    }
-
-                    @Override
-                    public void onFailure(Exception error) {
-                        response.put("success", Boolean.FALSE);
-                        response.put("errorCode", "-1");
-                        response.put("errorMessage", error.getMessage());
-                        result.success(response);
-                    }
-                });
-            } catch (IOException e) {
-                response.put("success", Boolean.FALSE);
-                response.put("errorCode", "-1");
-                response.put("errorMessage", e.getMessage());
-                result.success(response);
-            }
-        }
-
-        private void handleDeepLink ( final MethodCall call){
-
-            LogUtils.debug(DEBUG_NAME, "handleDeepLink call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-
-            final String url = call.argument("url");
-
-            Intent intent = new Intent(context, activity.getClass());
-            intent.putExtra("branch", url);
-            intent.putExtra("branch_force_new_session", true);
-            activity.startActivity(intent);
+                            result.success(response);
+                        }
+                    });
         }
+    }
 
-        private void addFacebookPartnerParameter (MethodCall call) {
-            LogUtils.debug(DEBUG_NAME, "addFacebookPartnerParameter call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-            final String key = call.argument("key");
-            final String value = call.argument("value");
+    private void getQRCode(final MethodCall call, final Result result) {
+        LogUtils.debug(DEBUG_NAME, "getQRCodeAsData call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        HashMap<String, Object> argsMap = (HashMap<String, Object>) call.arguments;
+        final BranchUniversalObject buo = branchSdkHelper.convertToBUO((HashMap<String, Object>) argsMap.get("buo"));
+        final LinkProperties linkProperties = branchSdkHelper.convertToLinkProperties((HashMap<String, Object>) argsMap.get("lp"));
+        final BranchQRCode branchQRCode = branchSdkHelper.convertToQRCode((HashMap<String, Object>) argsMap.get("qrCodeSettings"));
+        final Map<String, Object> response = new HashMap<>();
+        try {
+            branchQRCode.getQRCodeAsData(context, buo, linkProperties, new BranchQRCode.BranchQRCodeDataHandler() {
+                @Override
+                public void onSuccess(byte[] qrCodeData) {
 
-            if (!isInitialized) {
-                if (facebookParameters.has(key) && value.isEmpty()) {
-                    facebookParameters.remove(key);
-                } else {
-                    try {
-                        facebookParameters.put(key, value);
-                    } catch (JSONException error) {
-                    }
+                    response.put("success", Boolean.TRUE);
+                    response.put("result", qrCodeData);
+                    result.success(response);
                 }
-                return;
-            } else {
-                new Handler(Looper.getMainLooper()).post(new Runnable() {
-                    @Override
-                    public void run() {
-                        Branch.getAutoInstance(context).addFacebookPartnerParameterWithName(key, value);
-                    }
-                });
-
-            }
-        }
-        private void clearPartnerParameters () {
-            LogUtils.debug(DEBUG_NAME, "clearPartnerParameters call");
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
                 @Override
-                public void run() {
-                    Branch.getAutoInstance(context).clearPartnerParameters();
+                public void onFailure(Exception error) {
+                    response.put("success", Boolean.FALSE);
+                    response.put("errorCode", "-1");
+                    response.put("errorMessage", error.getMessage());
+                    result.success(response);
                 }
             });
+        } catch (IOException e) {
+            response.put("success", Boolean.FALSE);
+            response.put("errorCode", "-1");
+            response.put("errorMessage", e.getMessage());
+            result.success(response);
         }
+    }
 
-        private void setPreinstallCampaign (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setPreinstallCampaign call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
-            }
-
-            final String value = call.argument("value");
+    private void handleDeepLink(final MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "handleDeepLink call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        final String url = call.argument("url");
+        Intent intent = new Intent(context, activity.getClass());
+        intent.putExtra("branch", url);
+        intent.putExtra("branch_force_new_session", true);
+        activity.startActivity(intent);
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getAutoInstance(context).setPreinstallCampaign(value);
+    private void addFacebookPartnerParameter(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "addFacebookPartnerParameter call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        final String key = call.argument("key");
+        final String value = call.argument("value");
+        if (!isInitialized) {
+            if (facebookParameters.has(key) && value.isEmpty()) {
+                facebookParameters.remove(key);
+            } else {
+                try {
+                    facebookParameters.put(key, value);
+                } catch (JSONException error) {
                 }
-            });
+            }
+            return;
         }
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getAutoInstance(context).addFacebookPartnerParameterWithName(key, value);
+            }
+        });
+    }
 
-        private void setPreinstallPartner (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "setPreinstallPartner call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+    private void clearPartnerParameters() {
+        LogUtils.debug(DEBUG_NAME, "clearPartnerParameters call");
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getAutoInstance(context).clearPartnerParameters();
             }
+        });
+    }
 
-            final String value = call.argument("value");
+    private void setPreinstallCampaign(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setPreinstallCampaign call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        final String value = call.argument("value");
+        if (!isInitialized) {
+            campaingParameters.add(value);
+            return;
+        }
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getAutoInstance(context).setPreinstallCampaign(value);
+            }
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getAutoInstance(context).setPreinstallPartner(value);
-                }
-            });
+    private void setPreinstallPartner(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "setPreinstallPartner call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
         }
-        private void addSnapPartnerParameter (MethodCall call){
-            LogUtils.debug(DEBUG_NAME, "addSnapPartnerParameter call");
-            if (!(call.arguments instanceof Map)) {
-                throw new IllegalArgumentException("Map argument expected");
+        final String value = call.argument("value");
+        if (!isInitialized) {
+            preInstallParameters.add(value);
+            return;
+        }
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getAutoInstance(context).setPreinstallPartner(value);
             }
-            final String key = call.argument("key");
-            final String value = call.argument("value");
+        });
+    }
 
-            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Branch.getAutoInstance(context).addSnapPartnerParameterWithName(key, value);
+    private void addSnapPartnerParameter(MethodCall call) {
+        LogUtils.debug(DEBUG_NAME, "addSnapPartnerParameter call");
+        if (!(call.arguments instanceof Map)) {
+            throw new IllegalArgumentException("Map argument expected");
+        }
+        final String key = call.argument("key");
+        final String value = call.argument("value");
+        if (!isInitialized) {
+            if (snapParameters.has(key) && value.isEmpty()) {
+                snapParameters.remove(key);
+            } else {
+                try {
+                    snapParameters.put(key, value);
+                } catch (JSONException error) {
                 }
-            });
+            }
+            return;
         }
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                Branch.getAutoInstance(context).addSnapPartnerParameterWithName(key, value);
+            }
+        });
     }
+}
 
 
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 56306f79..fbc8e4b5 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -13,14 +13,19 @@ void main() async {
   //FlutterBranchSdk.setPreinstallCampaign('My Campaign Name');
   //FlutterBranchSdk.setPreinstallPartner('Branch \$3p Parameter Value');
   //FlutterBranchSdk.clearPartnerParameters();
-  //FlutterBranchSdk.addFacebookPartnerParameter(
-  //    key: 'em',
-  //    value: '11234e56af071e9c79927651156bd7a10bca8ac34672aba121056e2698ee7088');
-  //FlutterBranchSdk.addSnapPartnerParameter(
-  //    key: 'hashed_email_address',
-  //    value:
-  //        '11234e56af071e9c79927651156bd7a10bca8ac34672aba121056e2698ee7088');
-  await FlutterBranchSdk.init(useTestKey: true, enableLogging: false);
+  /*
+  FlutterBranchSdk.addFacebookPartnerParameter(
+      key: 'em',
+      value:
+          '11234e56af071e9c79927651156bd7a10bca8ac34672aba121056e2698ee7088');
+  FlutterBranchSdk.addSnapPartnerParameter(
+      key: 'hashed_email_address',
+      value:
+          '11234e56af071e9c79927651156bd7a10bca8ac34672aba121056e2698ee7088');
+  FlutterBranchSdk.setRequestMetadata('key1', 'value1');
+  FlutterBranchSdk.setRequestMetadata('key2', 'value2');
+  */
+  await FlutterBranchSdk.init();
   //await FlutterBranchSdk.requestTrackingAuthorization();
   runApp(const MyApp());
 }
@@ -98,14 +103,21 @@ class _HomePageState extends State<HomePage> {
   }
 
   void listenDynamicLinks() async {
-    streamSubscription = FlutterBranchSdk.listSession().listen((data) {
+    streamSubscription = FlutterBranchSdk.listSession().listen((data) async {
       print('listenDynamicLinks - DeepLink Data: $data');
       controllerData.sink.add((data.toString()));
 
+      /*
       if (data.containsKey('+is_first_session') &&
           data['+is_first_session'] == true) {
-        getFirstParameters();
+        // wait 3 seconds to obtain installation data
+        await Future.delayed(const Duration(seconds: 3));
+        Map<dynamic, dynamic> params =
+            await FlutterBranchSdk.getFirstReferringParams();
+        controllerData.sink.add(params.toString());
+        return;
       }
+       */
 
       if (data.containsKey('+clicked_branch_link') &&
           data['+clicked_branch_link'] == true) {
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 7a12c80f..99f1a81f 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -68,7 +68,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "7.0.0-beta0"
+    version: "7.0.0-beta.0"
   flutter_lints:
     dependency: "direct dev"
     description:
diff --git a/ios/Classes/SwiftFlutterBranchSdkPlugin.swift b/ios/Classes/SwiftFlutterBranchSdkPlugin.swift
index 7d9bd120..e84e283e 100644
--- a/ios/Classes/SwiftFlutterBranchSdkPlugin.swift
+++ b/ios/Classes/SwiftFlutterBranchSdkPlugin.swift
@@ -33,6 +33,10 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
     var isInitialized = false
     var branch : Branch?
     
+    var requestMetadata : [String: String] = [:]
+    var facebookParameters : [String: String] = [:]
+    var snapParameters : [String: String] = [:]
+        
     //---------------------------------------------------------------------------------------------
     // Plugin registry
     // --------------------------------------------------------------------------------------------
@@ -173,11 +177,6 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
         case "isUserIdentified":
             isUserIdentified(result: result)
             break
-        /*
-        case "setSKAdNetworkMaxTime" :
-            setSKAdNetworkMaxTime(call: call)
-            break
-         */
         case "requestTrackingAuthorization" :
             requestTrackingAuthorization(result: result)
             break
@@ -278,6 +277,22 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
             }
         }
         
+        if (!requestMetadata.isEmpty) {
+            for param in requestMetadata {
+                Branch.getInstance().setRequestMetadataKey(param.key, value: param.value)
+            }
+        }
+        if (!snapParameters.isEmpty) {
+            for param in snapParameters {
+                Branch.getInstance().addSnapPartnerParameter(withName: param.key, value: param.value)
+            }
+        }
+        if (!facebookParameters.isEmpty) {
+            for param in facebookParameters {
+                Branch.getInstance().addFacebookPartnerParameter(withName: param.key, value: param.value)
+            }
+        }
+
         branch!.initSession(launchOptions: initialLaunchOptions) { (params, error) in
             if error == nil {
                 print("Branch InitSession params: \(String(describing: params as? [String: Any]))")
@@ -299,7 +314,6 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
             }
         }
         
-        //
         //application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool
         if let _ = initialApplication , let _ = intitalURL , let _ = initialOptions {
             branch!.application(initialApplication, open: intitalURL, options: initialOptions)
@@ -487,6 +501,15 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
         let key = args["key"] as! String
         let value = args["value"] as! String
         
+        if (!isInitialized) {
+            if (requestMetadata.keys.contains(key) && value.isEmpty) {
+                requestMetadata.removeValue(forKey: key)
+            } else {
+                requestMetadata[key] = value;
+            }
+            return;
+        }
+
         DispatchQueue.main.async {
             self.branch!.setRequestMetadataKey(key, value: value)
         }
@@ -551,16 +574,6 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
         }
     }
 
-    /*
-    private func setSKAdNetworkMaxTime(call: FlutterMethodCall) {
-        let args = call.arguments as! [String: Any?]
-        let maxTimeInterval = args["maxTimeInterval"] as? Int ?? 0
-        DispatchQueue.main.async {
-            self.branch!.setSKAdNetworkCalloutMaxTimeSinceInstall(TimeInterval(maxTimeInterval * 3600))
-        }
-    }
-    */
-    
     private func isUserIdentified(result: @escaping FlutterResult) {
         DispatchQueue.main.async {
             result(self.branch!.isUserIdentified())
@@ -660,6 +673,14 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
         let key = args["key"] as! String
         let value = args["value"] as! String
         
+        if (!isInitialized) {
+            if (facebookParameters.keys.contains(key) && value.isEmpty) {
+                facebookParameters.removeValue(forKey: key)
+            } else {
+                facebookParameters[key] = value;
+            }
+            return;
+        }
         DispatchQueue.main.async {
             Branch.getInstance().addFacebookPartnerParameter(withName: key, value:value)
         }
@@ -670,6 +691,15 @@ public class SwiftFlutterBranchSdkPlugin: NSObject, FlutterPlugin, FlutterStream
         let key = args["key"] as! String
         let value = args["value"] as! String
         
+        if (!isInitialized) {
+            if (snapParameters.keys.contains(key) && value.isEmpty) {
+                snapParameters.removeValue(forKey: key)
+            } else {
+                snapParameters[key] = value;
+            }
+            return;
+        }
+
         DispatchQueue.main.async {
             Branch.getInstance().addSnapPartnerParameter(withName: key, value:value)
         }
diff --git a/lib/src/flutter_branch_sdk_method_channel.dart b/lib/src/flutter_branch_sdk_method_channel.dart
index 5f684b5b..e472bcd6 100644
--- a/lib/src/flutter_branch_sdk_method_channel.dart
+++ b/lib/src/flutter_branch_sdk_method_channel.dart
@@ -18,7 +18,6 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   final eventChannel = const EventChannel(EVENT_CHANNEL);
 
   static Stream<Map<dynamic, dynamic>>? _initSessionStream;
-
   static bool isInitialized = false;
 
   ///Initialize Branch SDK
@@ -32,6 +31,9 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
       bool enableLogging = false,
       bool enableFacebookLinkCheck = false,
       bool disableTracking = false}) async {
+    if (isInitialized) {
+      return;
+    }
     await messageChannel.invokeMethod('init', {
       'version': PLUGIN_VERSION,
       'useTestKey': useTestKey,
@@ -45,13 +47,16 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///Identifies the current user to the Branch API by supplying a unique identifier as a userId value
   @override
   void setIdentity(String userId) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `setIdentity` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('setIdentity', {'userId': userId});
   }
 
   ///Add key value pairs to all requests
   @override
   void setRequestMetadata(String key, String value) {
+    assert(!isInitialized,
+        'Call `setRequestMetadata` before `FlutterBranchSdk.init()` method');
     messageChannel
         .invokeMethod('setRequestMetadata', {'key': key, 'value': value});
   }
@@ -59,21 +64,24 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///This method should be called if you know that a different person is about to use the app
   @override
   void logout() {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(
+        isInitialized, 'Call `logout` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('logout');
   }
 
   ///Returns the last parameters associated with the link that referred the user
   @override
   Future<Map<dynamic, dynamic>> getLatestReferringParams() async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getLatestReferringParams` after `FlutterBranchSdk.init()` method');
     return await messageChannel.invokeMethod('getLatestReferringParams');
   }
 
   ///Returns the first parameters associated with the link that referred the user
   @override
   Future<Map<dynamic, dynamic>> getFirstReferringParams() async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getFirstReferringParams` after `FlutterBranchSdk.init()` method');
     return await messageChannel.invokeMethod('getFirstReferringParams');
   }
 
@@ -81,7 +89,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///SDK will not send any network calls except for deep linking when tracking is disabled
   @override
   void disableTracking(bool value) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `disableTracking` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('setTrackingDisabled', {'disable': value});
   }
 
@@ -90,7 +99,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   @Deprecated('Use `listSession')
   @override
   Stream<Map<dynamic, dynamic>> initSession() {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `initSession` after `FlutterBranchSdk.init()` method');
     _initSessionStream ??=
         eventChannel.receiveBroadcastStream().cast<Map<dynamic, dynamic>>();
 
@@ -100,7 +110,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///Listen click em Branch Deeplinks
   @override
   Stream<Map<dynamic, dynamic>> listSession() {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `listSession` after `FlutterBranchSdk.init()` method');
     _initSessionStream ??=
         eventChannel.receiveBroadcastStream().cast<Map<dynamic, dynamic>>();
 
@@ -111,7 +122,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///handle deep links correctly when you first integrate Branch into your app.
   @override
   void validateSDKIntegration() {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `validateSDKIntegration` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('validateSDKIntegration');
   }
 
@@ -120,7 +132,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   Future<BranchResponse> getShortUrl(
       {required BranchUniversalObject buo,
       required BranchLinkProperties linkProperties}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getShortUrl` after `FlutterBranchSdk.init()` method');
     Map<dynamic, dynamic> response = await messageChannel.invokeMethod(
         'getShortUrl', {'buo': buo.toMap(), 'lp': linkProperties.toMap()});
 
@@ -141,7 +154,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
       required String messageText,
       String androidMessageTitle = '',
       String androidSharingTitle = ''}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `showShareSheet` after `FlutterBranchSdk.init()` method');
     Map<dynamic, dynamic> response =
         await messageChannel.invokeMethod('showShareSheet', {
       'buo': buo.toMap(),
@@ -165,7 +179,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   void trackContent(
       {required List<BranchUniversalObject> buo,
       required BranchEvent branchEvent}) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `trackContent` after `FlutterBranchSdk.init()` method');
     Map<String, dynamic> params = {};
     params['buo'] = buo.map((b) => b.toMap()).toList();
     if (branchEvent.toMap().isNotEmpty) {
@@ -177,7 +192,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///Logs this BranchEvent to Branch for tracking and analytics
   @override
   void trackContentWithoutBuo({required BranchEvent branchEvent}) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `trackContentWithoutBuo` after `FlutterBranchSdk.init()` method');
     if (branchEvent.toMap().isEmpty) {
       throw ArgumentError('branchEvent is required');
     }
@@ -188,7 +204,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///Mark the content referred by this object as viewed. This increment the view count of the contents referred by this object.
   @override
   void registerView({required BranchUniversalObject buo}) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `registerView` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('registerView', {'buo': buo.toMap()});
   }
 
@@ -198,7 +215,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   Future<bool> listOnSearch(
       {required BranchUniversalObject buo,
       BranchLinkProperties? linkProperties}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `listOnSearch` after `FlutterBranchSdk.init()` method');
     Map<String, dynamic> params = {};
     params['buo'] = buo.toMap();
     if (linkProperties != null && linkProperties.toMap().isNotEmpty) {
@@ -214,7 +232,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   Future<bool> removeFromSearch(
       {required BranchUniversalObject buo,
       BranchLinkProperties? linkProperties}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `removeFromSearch` after `FlutterBranchSdk.init()` method');
     Map<String, dynamic> params = {};
     params['buo'] = buo.toMap();
     if (linkProperties != null && linkProperties.toMap().isNotEmpty) {
@@ -236,7 +255,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///This includes persisting through uninstalls, as we track device id.
   @override
   Future<bool> isUserIdentified() async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `isUserIdentified` after `FlutterBranchSdk.init()` method');
     return await messageChannel.invokeMethod('isUserIdentified');
   }
 
@@ -244,7 +264,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   /// on Android returns notSupported
   @override
   Future<AppTrackingStatus> requestTrackingAuthorization() async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `requestTrackingAuthorization` after `FlutterBranchSdk.init()` method');
     if (!Platform.isIOS) {
       return AppTrackingStatus.notSupported;
     }
@@ -257,7 +278,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   /// on Android returns notSupported
   @override
   Future<AppTrackingStatus> getTrackingAuthorizationStatus() async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getTrackingAuthorizationStatus` after `FlutterBranchSdk.init()` method');
     if (!Platform.isIOS) {
       return AppTrackingStatus.notSupported;
     }
@@ -270,7 +292,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   /// on Android returns empty string
   @override
   Future<String> getAdvertisingIdentifier() async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getAdvertisingIdentifier` after `FlutterBranchSdk.init()` method');
     if (!Platform.isIOS) {
       return "";
     }
@@ -281,43 +304,45 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
 
   @override
   void setConnectTimeout(int connectTimeout) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `setConnectTimeout` after `FlutterBranchSdk.init()` method');
     messageChannel
         .invokeMethod('setConnectTimeout', {'connectTimeout': connectTimeout});
   }
 
   @override
   void setRetryCount(int retryCount) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `setRetryCount` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('setRetryCount', {'retryCount': retryCount});
   }
 
   @override
   void setRetryInterval(int retryInterval) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `setRetryInterval` after `FlutterBranchSdk.init()` method');
     messageChannel
         .invokeMethod('setRetryInterval', {'retryInterval': retryInterval});
   }
 
   @override
   void setTimeout(int timeout) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `setTimeout` after `FlutterBranchSdk.init()` method');
     messageChannel.invokeMethod('setTimeout', {'timeout': timeout});
   }
 
   @override
   Future<BranchResponse> getLastAttributedTouchData(
       {int? attributionWindow}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getLastAttributedTouchData` after `FlutterBranchSdk.init()` method');
     Map<String, dynamic> params = {};
-
     if (attributionWindow != null) {
       params['attributionWindow'] = attributionWindow;
     }
-
     Map<dynamic, dynamic> response =
         await messageChannel.invokeMethod('getLastAttributedTouchData', params);
-
     if (response['success']) {
       return BranchResponse.success(result: response['data']['latd']);
     } else {
@@ -333,7 +358,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
       {required BranchUniversalObject buo,
       required BranchLinkProperties linkProperties,
       required BranchQrCode qrCodeSettings}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getQRCodeAsData` after `FlutterBranchSdk.init()` method');
     Map<dynamic, dynamic> response =
         await messageChannel.invokeMethod('getQRCode', {
       'buo': buo.toMap(),
@@ -356,7 +382,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
       {required BranchUniversalObject buo,
       required BranchLinkProperties linkProperties,
       required BranchQrCode qrCodeSettings}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `getQRCodeAsImage` after `FlutterBranchSdk.init()` method');
     Map<dynamic, dynamic> response =
         await messageChannel.invokeMethod('getQRCode', {
       'buo': buo.toMap(),
@@ -380,7 +407,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
       required BranchLinkProperties linkProperties,
       required Uint8List icon,
       required String title}) async {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `shareWithLPLinkMetadata` after `FlutterBranchSdk.init()` method');
     Map<String, dynamic> params = {};
     params['buo'] = buo.toMap();
     params['lp'] = linkProperties.toMap();
@@ -393,7 +421,8 @@ class FlutterBranchSdkMethodChannel implements FlutterBranchSdkPlatform {
   ///Have Branch end the current deep link session and start a new session with the provided URL.
   @override
   void handleDeepLink(String url) {
-    assert(isInitialized, 'Call the `init` method before using this function');
+    assert(isInitialized,
+        'Call `handleDeepLink` after `FlutterBranchSdk.init()` method');
     if (url.isEmpty) {
       throw ArgumentError('url is required');
     }
diff --git a/pubspec.lock b/pubspec.lock
index 37abb03f..18cf9ea5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -58,10 +58,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index a3628356..02659f1f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_branch_sdk
 description: Flutter Plugin for create deep link using Brach SDK (https://branch.io). This plugin provides a cross-platform (iOS, Android, Web).
-version: 7.0.0-beta0
+version: 7.0.0-beta.0
 homepage: https://github.com/RodrigoSMarques/flutter_branch_sdk
 
 environment:
@@ -18,7 +18,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.1
+  flutter_lints: ^2.0.3
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
