diff --git a/src/android/CountlyNative.java b/src/android/CountlyNative.java
index a76d020..4ef6459 100644
--- a/src/android/CountlyNative.java
+++ b/src/android/CountlyNative.java
@@ -1,53 +1,48 @@
 package ly.count.android.sdk;
 
-import ly.count.android.sdk.Countly;
-import ly.count.android.sdk.DeviceId;
-import ly.count.android.sdk.RemoteConfig;
-//import ly.count.android.sdk.DeviceInfo;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import android.app.Activity;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.iid.FirebaseInstanceId;
+
 import org.json.JSONArray;
 import org.json.JSONException;
+import org.json.JSONObject;
 
-import android.content.SharedPreferences;
-import android.util.Log;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.ArrayList;
 
-//Push Plugin
-import android.os.Build;
-import android.app.NotificationManager;
-import android.app.NotificationChannel;
+import ly.count.android.sdk.ModuleFeedback.CountlyFeedbackWidget;
+import ly.count.android.sdk.ModuleFeedback.FeedbackCallback;
+import ly.count.android.sdk.ModuleFeedback.FeedbackWidgetType;
 import ly.count.android.sdk.messaging.CountlyPush;
-import org.json.JSONObject;
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.InstanceIdResult;
-import com.google.android.gms.tasks.Task;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.firebase.FirebaseApp;
-import ly.count.android.sdk.ModuleFeedback.*;
 
 public class CountlyNative {
 
     public static final String TAG = "CountlyCordovaPlugin";
-    private String COUNTLY_CORDOVA_SDK_VERSION_STRING = "21.11.0";
-    private String COUNTLY_CORDOVA_SDK_NAME = "js-cordovab-android";
+    private final String COUNTLY_CORDOVA_SDK_VERSION_STRING = "21.11.0";
+    private final String COUNTLY_CORDOVA_SDK_NAME = "js-cordovab-android";
 
     private Countly.CountlyMessagingMode pushTokenTypeVariable = Countly.CountlyMessagingMode.PRODUCTION;
-    private Context context;
-    private Activity activity;
+    private final Context context;
+    private final Activity activity;
     private static Boolean isDebug = false;
-    private CountlyConfig config = new CountlyConfig();
+    private final CountlyConfig config = new CountlyConfig();
     private static Callback notificationListener = null;
     private static String lastStoredNotification = null;
 
-    private final Set<String> validConsentFeatureNames = new HashSet<String>(Arrays.asList(
+    private final Set<String> validConsentFeatureNames = new HashSet<>(Arrays.asList(
             Countly.CountlyFeatureNames.sessions, Countly.CountlyFeatureNames.events, Countly.CountlyFeatureNames.views,
             Countly.CountlyFeatureNames.location, Countly.CountlyFeatureNames.crashes,
             Countly.CountlyFeatureNames.attribution, Countly.CountlyFeatureNames.users,
@@ -94,8 +89,7 @@ public String init(JSONArray args) {
             Countly.sharedInstance().COUNTLY_SDK_NAME = COUNTLY_CORDOVA_SDK_NAME;
             Countly.sharedInstance().COUNTLY_SDK_VERSION_STRING = COUNTLY_CORDOVA_SDK_VERSION_STRING;
 
-            if (args.length() == 2) {
-            } else if (args.length() == 3) {
+            if (args.length() == 3) {
                 String yourDeviceID = args.getString(2);
                 if (yourDeviceID.equals("TemporaryDeviceID")) {
                     this.config.enableTemporaryDeviceIdMode();
@@ -122,7 +116,7 @@ public String init(JSONArray args) {
 
     public String isInitialized(JSONArray args) {
         this.log("isInitialized", args);
-        Boolean isInitialized = Countly.sharedInstance().isInitialized();
+        boolean isInitialized = Countly.sharedInstance().isInitialized();
         if (isInitialized) {
             return "true";
 
@@ -139,7 +133,7 @@ public void log(String method, JSONArray args) {
     }
 
     public String getCurrentDeviceId(JSONArray args) {
-        String deviceID = Countly.sharedInstance().getDeviceID();
+        String deviceID = Countly.sharedInstance().deviceId().getID();
         if (deviceID == null) {
             log("getCurrentDeviceId, deviceIdNotFound", LogLevel.DEBUG);
             return "deviceIdNotFound";
@@ -150,13 +144,13 @@ public String getCurrentDeviceId(JSONArray args) {
     }
 
     public String getDeviceIdAuthor(JSONArray args) {
-        DeviceId.Type deviceIDType = Countly.sharedInstance().getDeviceIDType();
+        DeviceIdType deviceIDType = Countly.sharedInstance().deviceId().getType();
         if (deviceIDType == null) {
             log("getDeviceIdAuthor, deviceIdAuthorNotFound", LogLevel.DEBUG);
             return "deviceIdAuthorNotFound";
         } else {
             log("getDeviceIdAuthor: " + deviceIDType, LogLevel.DEBUG);
-            if (deviceIDType == DeviceId.Type.DEVELOPER_SUPPLIED) {
+            if (deviceIDType == DeviceIdType.DEVELOPER_SUPPLIED) {
                 return "developerProvided";
             } else {
                 return "sdkGenerated";
@@ -184,11 +178,7 @@ public String setHttpPostForced(JSONArray args) {
         try {
             this.log("setHttpPostForced", args);
             int isEnabled = Integer.parseInt(args.getString(0));
-            if (isEnabled == 1) {
-                this.config.setHttpPostForced(true);
-            } else {
-                this.config.setHttpPostForced(false);
-            }
+            this.config.setHttpPostForced(isEnabled == 1);
             return "setHttpPostForced";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -251,7 +241,7 @@ public String setLocation(JSONArray args) {
             if ("null".equals(ipAddress)) {
                 ipAddress = null;
             }
-            Countly.sharedInstance().setLocation(countryCode, city, location, ipAddress);
+            Countly.sharedInstance().location().setLocation(countryCode, city, location, ipAddress);
             return "setLocation success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -278,7 +268,7 @@ public String addCrashLog(JSONArray args) {
     public String setCustomCrashSegments(JSONArray args) {
         try {
             this.log("setCustomCrashSegments", args);
-            HashMap<String, Object> segments = new HashMap<String, Object>();
+            HashMap<String, Object> segments = new HashMap<>();
             for (int i = 0, il = args.length(); i < il; i += 2) {
                 segments.put(args.getString(i), args.getString(i + 1));
             }
@@ -307,7 +297,7 @@ public String askForNotificationPermission(JSONArray args) {
             String channelName = "Default Name";
             String channelDescription = "Default Description";
             NotificationManager notificationManager = (NotificationManager) context
-                    .getSystemService(context.NOTIFICATION_SERVICE);
+                    .getSystemService(Context.NOTIFICATION_SERVICE);
             if (notificationManager != null) {
                 NotificationChannel channel = new NotificationChannel(CountlyPush.CHANNEL_ID, channelName,
                         NotificationManager.IMPORTANCE_DEFAULT);
@@ -318,16 +308,13 @@ public String askForNotificationPermission(JSONArray args) {
         CountlyPush.init(activity.getApplication(), pushTokenTypeVariable);
         FirebaseApp.initializeApp(context);
         FirebaseInstanceId.getInstance().getInstanceId()
-                .addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
-                    @Override
-                    public void onComplete(Task<InstanceIdResult> task) {
-                        if (!task.isSuccessful()) {
-                            log("getInstanceId failed", task.getException(), LogLevel.WARNING);
-                            return;
-                        }
-                        String token = task.getResult().getToken();
-                        CountlyPush.onTokenRefresh(token);
+                .addOnCompleteListener(task -> {
+                    if (!task.isSuccessful()) {
+                        log("getInstanceId failed", task.getException(), LogLevel.WARNING);
+                        return;
                     }
+                    String token = task.getResult().getToken();
+                    CountlyPush.onTokenRefresh(token);
                 });
         return "askForNotificationPermission";
     }
@@ -375,16 +362,6 @@ public String halt(JSONArray args) {
         return "halt: success";
     }
 
-    // public String eventSendThreshold(JSONArray args){
-    // try {
-    // int eventSendThreshold = Integer.parseInt(args.getString(0));
-    // Countly.sharedInstance().setEventQueueSizeToSend(eventSendThreshold);
-    // return "default";
-    // }catch (JSONException jsonException){
-    // return jsonException.toString();
-    // }
-    // }
-
     public String startEvent(JSONArray args) {
         try {
             this.log("startEvent", args);
@@ -412,8 +389,8 @@ public String endEvent(JSONArray args) {
             this.log("endEvent", args);
             String key = args.getString(0);
             int count = Integer.parseInt(args.getString(1));
-            float sum = Float.valueOf(args.getString(2)); // new Float(args.getString(2)).floatValue();
-            HashMap<String, Object> segmentation = new HashMap<String, Object>();
+            float sum = Float.parseFloat(args.getString(2)); // new Float(args.getString(2)).floatValue();
+            HashMap<String, Object> segmentation = new HashMap<>();
             if (args.length() > 3) {
                 for (int i = 3, il = args.length(); i < il; i += 2) {
                     segmentation.put(args.getString(i), args.getString(i + 1));
@@ -431,9 +408,9 @@ public String recordEvent(JSONArray args) {
             this.log("recordEvent", args);
             String key = args.getString(0);
             int count = Integer.parseInt(args.getString(1));
-            float sum = Float.valueOf(args.getString(2)); // new Float(args.getString(2)).floatValue();
+            float sum = Float.parseFloat(args.getString(2)); // new Float(args.getString(2)).floatValue();
             int duration = Integer.parseInt(args.getString(3));
-            HashMap<String, Object> segmentation = new HashMap<String, Object>();
+            HashMap<String, Object> segmentation = new HashMap<>();
             if (args.length() > 4) {
                 for (int i = 4, il = args.length(); i < il; i += 2) {
                     segmentation.put(args.getString(i), args.getString(i + 1));
@@ -482,8 +459,8 @@ public String userData_setProperty(JSONArray args) {
             this.log("userData_setProperty", args);
             String keyName = args.getString(0);
             String keyValue = args.getString(1);
-            Countly.userData.setProperty(keyName, keyValue);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().setProperty(keyName, keyValue);
+            Countly.sharedInstance().userProfile().save();
             return "userData_setProperty success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -494,8 +471,8 @@ public String userData_increment(JSONArray args) {
         try {
             this.log("userData_increment", args);
             String keyName = args.getString(0);
-            Countly.userData.increment(keyName);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().increment(keyName);
+            Countly.sharedInstance().userProfile().save();
             return "userData_increment: success";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -507,8 +484,8 @@ public String userData_incrementBy(JSONArray args) {
             this.log("userData_incrementBy", args);
             String keyName = args.getString(0);
             int keyIncrement = Integer.parseInt(args.getString(1));
-            Countly.userData.incrementBy(keyName, keyIncrement);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().incrementBy(keyName, keyIncrement);
+            Countly.sharedInstance().userProfile().save();
             return "userData_incrementBy success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -520,8 +497,8 @@ public String userData_multiply(JSONArray args) {
             this.log("userData_multiply", args);
             String keyName = args.getString(0);
             int multiplyValue = Integer.parseInt(args.getString(1));
-            Countly.userData.multiply(keyName, multiplyValue);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().multiply(keyName, multiplyValue);
+            Countly.sharedInstance().userProfile().save();
             return "userData_multiply success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -533,8 +510,8 @@ public String userData_saveMax(JSONArray args) {
             this.log("userData_saveMax", args);
             String keyName = args.getString(0);
             int maxScore = Integer.parseInt(args.getString(1));
-            Countly.userData.saveMax(keyName, maxScore);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().saveMax(keyName, maxScore);
+            Countly.sharedInstance().userProfile().save();
             return "userData_saveMax success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -546,8 +523,8 @@ public String userData_saveMin(JSONArray args) {
             this.log("userData_saveMin", args);
             String keyName = args.getString(0);
             int minScore = Integer.parseInt(args.getString(1));
-            Countly.userData.saveMin(keyName, minScore);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().saveMin(keyName, minScore);
+            Countly.sharedInstance().userProfile().save();
             return "userData_saveMin success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -559,8 +536,8 @@ public String userData_setOnce(JSONArray args) {
             this.log("userData_setOnce", args);
             String keyName = args.getString(0);
             String minScore = args.getString(1);
-            Countly.userData.setOnce(keyName, minScore);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().setOnce(keyName, minScore);
+            Countly.sharedInstance().userProfile().save();
             return "userData_setOnce success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -572,8 +549,8 @@ public String userData_pushUniqueValue(JSONArray args) {
             this.log("userData_pushUniqueValue", args);
             String type = args.getString(0);
             String pushUniqueValue = args.getString(1);
-            Countly.userData.pushUniqueValue(type, pushUniqueValue);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().pushUnique(type, pushUniqueValue);
+            Countly.sharedInstance().userProfile().save();
             return "userData_pushUniqueValue success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -585,8 +562,8 @@ public String userData_pushValue(JSONArray args) {
             this.log("userData_pushValue", args);
             String type = args.getString(0);
             String pushValue = args.getString(1);
-            Countly.userData.pushValue(type, pushValue);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().push(type, pushValue);
+            Countly.sharedInstance().userProfile().save();
             return "userData_pushValue success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -598,8 +575,8 @@ public String userData_pullValue(JSONArray args) {
             this.log("userData_pullValue", args);
             String type = args.getString(0);
             String pullValue = args.getString(1);
-            Countly.userData.pullValue(type, pullValue);
-            Countly.userData.save();
+            Countly.sharedInstance().userProfile().pull(type, pullValue);
+            Countly.sharedInstance().userProfile().save();
             return "userData_pullValue success!";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -610,10 +587,7 @@ public String setRequiresConsent(JSONArray args) {
         try {
             this.log("setRequiresConsent", args);
             String consentFlagString = args.getString(0);
-            Boolean consentFlag = false;
-            if (consentFlagString.equals("1")) {
-                consentFlag = true;
-            }
+            boolean consentFlag = consentFlagString.equals("1");
             this.config.setRequiresConsent(consentFlag);
             return "setRequiresConsent: Success";
         } catch (JSONException jsonException) {
@@ -633,7 +607,7 @@ public String giveConsentInit(JSONArray featureNames) {
                     log("Not a valid consent feature to add: " + featureName, LogLevel.DEBUG);
                 }
             }
-            this.config.setConsentEnabled(features.toArray(new String[features.size()]));
+            this.config.setConsentEnabled(features.toArray(new String[0]));
             return "giveConsentInit: Success";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -652,7 +626,7 @@ public String giveConsent(JSONArray featureNames) {
                     log("Not a valid consent feature to add: " + featureName, LogLevel.DEBUG);
                 }
             }
-            Countly.sharedInstance().consent().giveConsent(features.toArray(new String[features.size()]));
+            Countly.sharedInstance().consent().giveConsent(features.toArray(new String[0]));
             return "giveConsent: Success";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -671,7 +645,7 @@ public String removeConsent(JSONArray featureNames) {
                     log("Not a valid consent feature to remove: " + featureName, LogLevel.DEBUG);
                 }
             }
-            Countly.sharedInstance().consent().removeConsent(features.toArray(new String[features.size()]));
+            Countly.sharedInstance().consent().removeConsent(features.toArray(new String[0]));
             return "removeConsent: Success";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -690,28 +664,11 @@ public String removeAllConsent(JSONArray args) {
         return "removeAllConsent: Success";
     }
 
-    // public String sendRating(JSONArray args){
-    // try {
-    // String ratingString = args.getString(0);
-    // int rating = Integer.parseInt(ratingString);
-
-    // Map<String, String> segm = new HashMap<>();
-    // segm.put("platform", "android");
-    // // segm.put("app_version", DeviceInfo.getAppVersion(context));
-    // segm.put("rating", "" + rating);
-
-    // Countly.sharedInstance().recordEvent("[CLY]_star_rating", segm, 1);
-    // return "sendRating: " + ratingString;
-    // }catch (JSONException jsonException){
-    // return jsonException.toString();
-    // }
-    // }
-
     public String recordView(JSONArray args) {
         try {
             this.log("recordView", args);
             String viewName = args.getString(0);
-            HashMap<String, Object> segmentation = new HashMap<String, Object>();
+            HashMap<String, Object> segmentation = new HashMap<>();
             for (int i = 1, il = args.length(); i < il; i += 2) {
                 try {
                     segmentation.put(args.getString(i), args.getString(i + 1));
@@ -749,7 +706,7 @@ public String setOptionalParametersForInitialization(JSONArray args) {
             if (ipAddress.equals("0.0.0.0")) {
                 ipAddress = null;
             }
-            Countly.sharedInstance().setLocation(country, city, latlng, ipAddress);
+            Countly.sharedInstance().location().setLocation(country, city, latlng, ipAddress);
             return "setOptionalParametersForInitialization sent.";
         } catch (JSONException jsonException) {
             return jsonException.toString();
@@ -758,14 +715,11 @@ public String setOptionalParametersForInitialization(JSONArray args) {
 
     public String setRemoteConfigAutomaticDownload(JSONArray args, final Callback theCallback) {
         this.log("setRemoteConfigAutomaticDownload", args);
-        this.config.setRemoteConfigAutomaticDownload(true, new RemoteConfig.RemoteConfigCallback() {
-            @Override
-            public void callback(String error) {
-                if (error == null) {
-                    theCallback.callback("Success");
-                } else {
-                    theCallback.callback("Error: " + error.toString());
-                }
+        this.config.setRemoteConfigAutomaticDownload(true, (RemoteConfigCallback) error -> {
+            if (error == null) {
+                theCallback.callback("Success");
+            } else {
+                theCallback.callback("Error: " + error);
             }
         });
         return "setRemoteConfigAutomaticDownload: Success";
@@ -773,14 +727,11 @@ public void callback(String error) {
 
     public String remoteConfigUpdate(JSONArray args, final Callback theCallback) {
         this.log("remoteConfigUpdate", args);
-        Countly.sharedInstance().remoteConfig().update(new RemoteConfigCallback() {
-            @Override
-            public void callback(String error) {
-                if (error == null) {
-                    theCallback.callback("Success");
-                } else {
-                    theCallback.callback("Error: " + error.toString());
-                }
+        Countly.sharedInstance().remoteConfig().update(error -> {
+            if (error == null) {
+                theCallback.callback("Success");
+            } else {
+                theCallback.callback("Error: " + error);
             }
         });
         return "remoteConfigUpdate: success";
@@ -792,16 +743,12 @@ public String updateRemoteConfigForKeysOnly(JSONArray args, final Callback theCa
             String[] keysOnly = new String[args.length()];
             for (int i = 0, il = args.length(); i < il; i++) {
                 keysOnly[i] = args.getString(i);
-                ;
             }
-            Countly.sharedInstance().remoteConfig().updateForKeysOnly(keysOnly, new RemoteConfigCallback() {
-                @Override
-                public void callback(String error) {
-                    if (error == null) {
-                        theCallback.callback("Success");
-                    } else {
-                        theCallback.callback("Error: " + error.toString());
-                    }
+            Countly.sharedInstance().remoteConfig().updateForKeysOnly(keysOnly, error -> {
+                if (error == null) {
+                    theCallback.callback("Success");
+                } else {
+                    theCallback.callback("Error: " + error);
                 }
             });
             return "updateRemoteConfigForKeysOnly: success";
@@ -817,14 +764,11 @@ public String updateRemoteConfigExceptKeys(JSONArray args, final Callback theCal
             for (int i = 0, il = args.length(); i < il; i++) {
                 exceptKeys[i] = args.getString(i);
             }
-            Countly.sharedInstance().remoteConfig().updateExceptKeys(exceptKeys, new RemoteConfigCallback() {
-                @Override
-                public void callback(String error) {
-                    if (error == null) {
-                        theCallback.callback("Success");
-                    } else {
-                        theCallback.callback("Error: " + error.toString());
-                    }
+            Countly.sharedInstance().remoteConfig().updateExceptKeys(exceptKeys, error -> {
+                if (error == null) {
+                    theCallback.callback("Success");
+                } else {
+                    theCallback.callback("Error: " + error);
                 }
             });
             return "updateRemoteConfigExceptKeys: Success";
@@ -842,9 +786,8 @@ public String remoteConfigClearValues(JSONArray args) {
     public String getRemoteConfigValueForKey(JSONArray args) {
         try {
             this.log("getRemoteConfigValueForKey", args);
-            String getRemoteConfigValueForKeyResult = Countly.sharedInstance().remoteConfig()
+            return Countly.sharedInstance().remoteConfig()
                     .getValueForKey(args.getString(0)).toString();
-            return getRemoteConfigValueForKeyResult;
         } catch (JSONException jsonException) {
             return jsonException.toString();
         }
@@ -855,16 +798,13 @@ public String askForFeedback(JSONArray args, final Callback theCallback) {
             this.log("askForFeedback", args);
             String widgetId = args.getString(0);
             String closeButtonText = args.getString(1);
-            Countly.sharedInstance().ratings().showFeedbackPopup(widgetId, closeButtonText, activity,
-                    new FeedbackRatingCallback() {
-                        @Override
-                        public void callback(String error) {
-                            if (error != null) {
-                                theCallback.callback(
-                                        "Error: Encountered error while showing feedback dialog: [" + error + "]");
-                            } else {
-                                theCallback.callback("Feedback submitted.");
-                            }
+            Countly.sharedInstance().ratings().presentRatingWidgetWithID(widgetId, closeButtonText, activity,
+                    error -> {
+                        if (error != null) {
+                            theCallback.callback(
+                                    "Error: Encountered error while showing feedback dialog: [" + error + "]");
+                        } else {
+                            theCallback.callback("Feedback submitted.");
                         }
                     });
             return "askForFeedback: success";
@@ -899,28 +839,25 @@ public String appLoadingFinished(JSONArray args) {
     }
 
     public String getFeedbackWidgets(JSONArray args, final JSONObjectCallback theCallback) {
-        Countly.sharedInstance().feedback().getAvailableFeedbackWidgets(new RetrieveFeedbackWidgets() {
-            @Override
-            public void onFinished(List<CountlyFeedbackWidget> retrievedWidgets, String error) {
-                if (error != null) {
-                    theCallback.error(error);
-                }
+        Countly.sharedInstance().feedback().getAvailableFeedbackWidgets((retrievedWidgets, error) -> {
+            if (error != null) {
+                theCallback.error(error);
+            }
 
-                JSONArray retrievedWidgetsArray = new JSONArray();
-                for (CountlyFeedbackWidget presentableFeedback : retrievedWidgets) {
-                    try {
-                        JSONObject feedbackWidget = new JSONObject();
-                        feedbackWidget.put("id", presentableFeedback.widgetId);
-                        feedbackWidget.put("type", presentableFeedback.type.name());
-                        feedbackWidget.put("name", presentableFeedback.name);
-                        retrievedWidgetsArray.put(feedbackWidget);
-
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
+            JSONArray retrievedWidgetsArray = new JSONArray();
+            for (CountlyFeedbackWidget presentableFeedback : retrievedWidgets) {
+                try {
+                    JSONObject feedbackWidget = new JSONObject();
+                    feedbackWidget.put("id", presentableFeedback.widgetId);
+                    feedbackWidget.put("type", presentableFeedback.type.name());
+                    feedbackWidget.put("name", presentableFeedback.name);
+                    retrievedWidgetsArray.put(feedbackWidget);
+
+                } catch (JSONException e) {
+                    e.printStackTrace();
                 }
-                theCallback.success(retrievedWidgetsArray);
             }
+            theCallback.success(retrievedWidgetsArray);
         });
         return "getAvailableFeedbackWidgets success.";
     }
@@ -967,11 +904,11 @@ public void onFinished(String error) {
     }
 
     public void replaceAllAppKeysInQueueWithCurrentAppKey() {
-        Countly.sharedInstance().requestQueueOverwriteAppKeys();
+        Countly.sharedInstance().requestQueue().overwriteAppKeys();
     }
 
     public void removeDifferentAppKeysFromQueue() {
-        Countly.sharedInstance().requestQueueEraseAppKeysRequests();
+        Countly.sharedInstance().requestQueue().eraseWrongAppKeyRequests();
     }
 
     public String sendPushToken(JSONArray args) {
@@ -1024,7 +961,7 @@ public String endTrace(JSONArray args) {
         try {
             this.log("endTrace", args);
             String traceKey = args.getString(0);
-            HashMap<String, Integer> customMetric = new HashMap<String, Integer>();
+            HashMap<String, Integer> customMetric = new HashMap<>();
             for (int i = 1, il = args.length(); i < il; i += 2) {
                 try {
                     customMetric.put(args.getString(i), Integer.parseInt(args.getString(i + 1)));
diff --git a/src/ios/CountlyNative.m b/src/ios/CountlyNative.m
index 78052d7..983d802 100644
--- a/src/ios/CountlyNative.m
+++ b/src/ios/CountlyNative.m
@@ -254,14 +254,14 @@ + (void)onNotification: (NSDictionary *) notificationMessage{
         if(notificationListener != nil){
             notificationListener([NSString stringWithFormat:@"%@",notificationMessage]);
         }
-        [self recordPushAction];
+        [CountlyNative recordPushAction];
     }
     else{
         // Notification is cached if SDK is not initialized and send in callback when 'registerForNotification' is call.
         lastStoredNotification = notificationMessage;
     }
 }
-- (void)recordPushAction
++ (void)recordPushAction
 {
     for(int i=0,il = (int) notificationIDs.count;i<il;i++){
         NSString *notificationID = notificationIDs[i];
@@ -314,7 +314,7 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
             [[Countly sharedInstance] startWithConfig:config];
 
 #ifndef COUNTLY_EXCLUDE_PUSHNOTIFICATIONS
-            [self recordPushAction];
+            [CountlyNative recordPushAction];
 #endif
             });
             result(@"initialized.");
@@ -574,7 +574,7 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
         dispatch_async(dispatch_get_main_queue(), ^ {
         NSString* countryCode = [command objectAtIndex:0];
         NSString* city = [command objectAtIndex:1];
-        NSString* locationString = [command objectAtIndex:2];
+        NSString* gpsCoordinate = [command objectAtIndex:2];
         NSString* ipAddress = [command objectAtIndex:3];
 
         if([@"null" isEqualToString:city]){
@@ -583,31 +583,16 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
         if([@"null" isEqualToString:countryCode]){
             countryCode = nil;
         }
-        if([@"null" isEqualToString:locationString]){
-            locationString = nil;
+        if([@"null" isEqualToString:gpsCoordinate]){
+            gpsCoordinate = nil;
         }
         if([@"null" isEqualToString:ipAddress]){
             ipAddress = nil;
         }
 
-        if(locationString != nil && [locationString containsString:@","]){
-            @try{
-                NSArray *locationArray = [locationString componentsSeparatedByString:@","];
-                NSString* latitudeString = [locationArray objectAtIndex:0];
-                NSString* longitudeString = [locationArray objectAtIndex:1];
-
-                double latitudeDouble = [latitudeString doubleValue];
-                double longitudeDouble = [longitudeString doubleValue];
-                [Countly.sharedInstance recordLocation:(CLLocationCoordinate2D){latitudeDouble,longitudeDouble}];
-            }
-            @catch(NSException *exception){
-                COUNTLY_CORDOVA_LOG(@"Invalid location: %@", locationString);
-            }
-        }
-
-        [Countly.sharedInstance recordCity:city andISOCountryCode:countryCode];
-        [Countly.sharedInstance recordIP:ipAddress];
-
+        CLLocationCoordinate2D locationCoordinate = [self getCoordinate:gpsCoordinate];
+        [Countly.sharedInstance recordLocation:locationCoordinate city:city ISOCountryCode:countryCode IP:ipAddress];
+            
         result(@"setLocation!");
         });
 
@@ -848,12 +833,34 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
         NSString* longitudeString = [command objectAtIndex:3];
         NSString* ipAddress = [command objectAtIndex:4];
 
-        double latitudeDouble = [latitudeString doubleValue];
-        double longitudeDouble = [longitudeString doubleValue];
-
-        [Countly.sharedInstance recordLocation:(CLLocationCoordinate2D){latitudeDouble,longitudeDouble}];
-        [Countly.sharedInstance recordCity:city andISOCountryCode:country];
-        [Countly.sharedInstance recordIP:ipAddress];
+        if([@"null" isEqualToString:city]){
+            city = nil;
+        }
+        if([@"null" isEqualToString:country]){
+            country = nil;
+        }
+        if([@"null" isEqualToString:latitudeString]){
+            latitudeString = nil;
+        }
+        if([@"null" isEqualToString:longitudeString]){
+            longitudeString = nil;
+        }
+        if([@"null" isEqualToString:ipAddress]){
+            ipAddress = nil;
+        }
+        CLLocationCoordinate2D location;
+        if(latitudeString != nil && longitudeString != nil){
+            @try{
+                double latitudeDouble = [latitudeString doubleValue];
+                double longitudeDouble = [longitudeString doubleValue];
+                
+                location = (CLLocationCoordinate2D){latitudeDouble,longitudeDouble};
+            }
+            @catch(NSException *execption){
+                COUNTLY_CORDOVA_LOG(@"Invalid latitude or longitude.");
+            }
+        }
+        [Countly.sharedInstance recordLocation:location city:city ISOCountryCode:country IP:ipAddress];
         result(@"setOptionalParametersForInitialization!");
         });
 
@@ -966,7 +973,7 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
     }else if ([@"askForFeedback" isEqualToString:method]) {
         dispatch_async(dispatch_get_main_queue(), ^ {
         NSString* widgetId = [command objectAtIndex:0];
-        [Countly.sharedInstance presentFeedbackWidgetWithID:widgetId completionHandler:^(NSError* error){
+        [Countly.sharedInstance presentRatingWidgetWithID:widgetId completionHandler:^(NSError* error){
             if (error){
                 NSString *theError = [@"Feedback widget presentation failed: " stringByAppendingString: error.localizedDescription];
                 result(theError);
@@ -1024,9 +1031,6 @@ - (void) onCall:(NSString *)method commandString:(NSArray *)command callback:(Re
         });
     }else if ([@"getPlatformVersion" isEqualToString:method]) {
         result([@"iOS " stringByAppendingString:[[UIDevice currentDevice] systemVersion]]);
-    }else if ([@"enableAttribution" isEqualToString:method]) {
-        config.enableAttribution = YES;
-        result(@"enableAttribution");
     }else if ([@"recordAttributionID" isEqualToString:method]) {
         dispatch_async(dispatch_get_main_queue(), ^ {
         NSString* attributionID = [command objectAtIndex:0];
@@ -1143,4 +1147,36 @@ void CountlyCordovaInternalLog(NSString *format, ...)
     va_end(args);
 }
 
-@end
\ No newline at end of file
+- (CLLocationCoordinate2D) getCoordinate:(NSString*) gpsCoordinate
+{
+    CLLocationCoordinate2D locationCoordinate = kCLLocationCoordinate2DInvalid;
+    if(gpsCoordinate){
+        if([gpsCoordinate containsString:@","]) {
+            @try{
+                NSArray *locationArray = [gpsCoordinate componentsSeparatedByString:@","];
+                if(locationArray.count > 2) {
+                    COUNTLY_CORDOVA_LOG(@"Invalid location Coordinates:[%@], it should contains only two comma seperated values", gpsCoordinate);
+                }
+                NSString* latitudeString = [locationArray objectAtIndex:0];
+                NSString* longitudeString = [locationArray objectAtIndex:1];
+                
+                double latitudeDouble = [latitudeString doubleValue];
+                double longitudeDouble = [longitudeString doubleValue];
+                if(latitudeDouble == 0 || longitudeDouble == 0) {
+                    COUNTLY_CORDOVA_LOG(@"Invalid location Coordinates, One of the values parsed to a 0, double check that given coordinates are correct:[%@]", gpsCoordinate);
+                }
+                locationCoordinate = (CLLocationCoordinate2D){latitudeDouble,longitudeDouble};
+            }
+            @catch(NSException *exception) {
+                COUNTLY_CORDOVA_LOG(@"Invalid location Coordinates:[%@], Exception occurred while parsing Coordinates:[%@]", gpsCoordinate, exception);
+            }
+        }
+        else {
+            COUNTLY_CORDOVA_LOG(@"Invalid location Coordinates:[%@], lat and long values should be comma separated", gpsCoordinate);
+        }
+        
+    }
+    return locationCoordinate;
+}
+
+@end