diff --git a/app/src/main/java/com/iterable/androidsdk/MainActivity.java b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
index c5f0725b8..2176cd639 100644
--- a/app/src/main/java/com/iterable/androidsdk/MainActivity.java
+++ b/app/src/main/java/com/iterable/androidsdk/MainActivity.java
@@ -1,16 +1,27 @@
 package com.iterable.androidsdk;
 
 import android.os.Bundle;
+
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.iterable.iterableapi.CommerceItem;
+import com.iterable.iterableapi.IterableApi;
 import com.iterable.iterableapi.testapp.R;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class MainActivity extends AppCompatActivity {
 
     @Override
@@ -20,6 +31,10 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+//        IterableApi.initialize(this, "1c4b47f3177b44c6b9bc1524b21d1ba7");
+        //Below api key is used to display merge user feature
+        IterableApi.initialize(this, "289895aa038648ee9e4ce60bd0a46e9c");
+
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -28,6 +43,40 @@ public void onClick(View view) {
                         .setAction("Action", null).show();
             }
         });
+
+        findViewById(R.id.btn_track_event).setOnClickListener(v -> IterableApi.getInstance().track("Browse Mocha"));
+
+        findViewById(R.id.btn_update_cart).setOnClickListener(v -> {
+            List<CommerceItem> items = new ArrayList<>();
+            items.add(new CommerceItem("123", "Mocha", 1, 1));
+            IterableApi.getInstance().updateCart(items);
+        });
+
+        findViewById(R.id.btn_buy_mocha).setOnClickListener(v -> {
+            List<CommerceItem> items = new ArrayList<>();
+            items.add(new CommerceItem("456", "Black Coffee", 2, 1));
+            IterableApi.getInstance().trackPurchase(4, items);
+        });
+
+        findViewById(R.id.btn_buy_coffee).setOnClickListener(v -> {
+            List<CommerceItem> items = new ArrayList<>();
+            items.add(new CommerceItem("456", "Black Coffee", 5, 1));
+            IterableApi.getInstance().trackPurchase(5, items);
+        });
+
+        findViewById(R.id.btn_set_user).setOnClickListener(v -> IterableApi.getInstance().setUserId("hani7"));
+
+        findViewById(R.id.btn_update_user).setOnClickListener(v -> {
+            try {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("firstName", "Hani");
+                IterableApi.getInstance().updateUser(jsonObject);
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        findViewById(R.id.btn_logout).setOnClickListener(view -> IterableApi.getInstance().setUserId(null));
     }
 
     @Override
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 5646874e1..a56897e97 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -10,10 +10,51 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="com.iterable.androidsdk.MainActivity"
-    tools:showIn="@layout/activity_main">
+    tools:showIn="@layout/activity_main"
+    android:gravity="center"
+    android:orientation="vertical">
 
-    <TextView
+    <Button
+        android:id="@+id/btn_track_event"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!" />
-</RelativeLayout>
+        android:text="Browse Mocha" />
+
+    <Button
+        android:id="@+id/btn_update_cart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Update cart" />
+
+    <Button
+        android:id="@+id/btn_buy_mocha"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Buy Black Coffee - $2" />
+
+    <Button
+        android:id="@+id/btn_buy_coffee"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Buy Black Coffee - $5" />
+
+    <Button
+        android:id="@+id/btn_set_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="set user id" />
+
+    <Button
+        android:id="@+id/btn_update_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="set user name" />
+
+    <Button
+        android:visibility="gone"
+        android:id="@+id/btn_logout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Logout"/>
+
+</LinearLayout>
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/AnonymousUserManager.java b/iterableapi/src/main/java/com/iterable/iterableapi/AnonymousUserManager.java
index 93c67abd0..2eb8bbc59 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/AnonymousUserManager.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/AnonymousUserManager.java
@@ -2,9 +2,11 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -46,10 +48,10 @@ void updateAnonSession() {
 
             JSONObject newDataObject = new JSONObject();
             newDataObject.put(IterableConstants.SHARED_PREFS_SESSION_NO, sessionNo + 1);
-            newDataObject.put(IterableConstants.SHARED_PREFS_LAST_SESSION, getCurrentDateTime());
+            newDataObject.put(IterableConstants.SHARED_PREFS_LAST_SESSION, getCurrentTime());
 
             if (firstSessionDate.isEmpty()) {
-                newDataObject.put(IterableConstants.SHARED_PREFS_FIRST_SESSION, getCurrentDateTime());
+                newDataObject.put(IterableConstants.SHARED_PREFS_FIRST_SESSION, getCurrentTime());
             } else {
                 newDataObject.put(IterableConstants.SHARED_PREFS_FIRST_SESSION, firstSessionDate);
             }
@@ -83,6 +85,18 @@ void trackAnonEvent(String eventName, JSONObject dataFields) {
         }
     }
 
+    void trackAnonUpdateUser(JSONObject dataFields) {
+        IterableLogger.v(TAG, "updateAnonUser");
+        try {
+            JSONObject newDataObject = new JSONObject();
+            newDataObject.put(IterableConstants.DATA_REPLACE, dataFields);
+            newDataObject.put(IterableConstants.SHARED_PREFS_EVENT_TYPE, IterableConstants.UPDATE_USER);
+            storeEventListToLocalStorage(newDataObject, true);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     void trackAnonPurchaseEvent(double total, @NonNull List<CommerceItem> items, @Nullable JSONObject dataFields) {
 
         IterableLogger.v(TAG, "trackAnonPurchaseEvent");
@@ -119,120 +133,22 @@ void trackAnonUpdateCart(@NonNull List<CommerceItem> items) {
     }
 
     void getCriteria() {
-        try {
-            // call API when it is available and save data in SharedPreferences, until then just save the data using static data
-            String mockData = "{" +
-                    "    \"count\":2," +
-                    "    \"criteriaList\":[" +
-                    "        {" +
-                    "            \"criteriaId\":12345," +
-                    "            \"searchQuery\":{" +
-                    "                \"combinator\":\"Or\"," +
-                    "                \"searchQueries\":[" +
-                    "                    {" +
-                    "                        \"combinator\":\"And\"," +
-                    "                        \"searchQueries\":[" +
-                    "                            {" +
-                    "                                \"dataType\":\"purchase\"," +
-                    "                                \"searchCombo\":{" +
-                    "                                    \"combinator\":\"And\"," +
-                    "                                    \"searchQueries\":[" +
-                    "                                        {" +
-                    "                                            \"field\":\"shoppingCartItems.price\"," +
-                    "                                            \"fieldType\":\"double\"," +
-                    "                                            \"comparatorType\":\"Equals\"," +
-                    "                                            \"dataType\":\"purchase\"," +
-                    "                                            \"id\":2," +
-                    "                                            \"value\":\"4.67\"" +
-                    "                                        }," +
-                    "                                        {" +
-                    "                                            \"field\":\"shoppingCartItems.quantity\"," +
-                    "                                            \"fieldType\":\"long\"," +
-                    "                                            \"comparatorType\":\"GreaterThanOrEqualTo\"," +
-                    "                                            \"dataType\":\"purchase\"," +
-                    "                                            \"id\":3," +
-                    "                                            \"valueLong\":2," +
-                    "                                            \"value\":\"2\"" +
-                    "                                        }" +
-                    "                                    ]" +
-                    "                                }" +
-                    "                            }" +
-                    "                        ]" +
-                    "                    }" +
-                    "                ]" +
-                    "            }" +
-                    "        }," +
-                    "        {" +
-                    "            \"criteriaId\":5678," +
-                    "            \"searchQuery\":{" +
-                    "                \"combinator\":\"Or\"," +
-                    "                \"searchQueries\":[" +
-                    "                    {" +
-                    "                        \"combinator\":\"Or\"," +
-                    "                        \"searchQueries\":[" +
-                    "                            {" +
-                    "                                \"dataType\":\"user\"," +
-                    "                                \"searchCombo\":{" +
-                    "                                    \"combinator\":\"And\"," +
-                    "                                    \"searchQueries\":[" +
-                    "                                        {" +
-                    "                                            \"field\":\"itblInternal.emailDomain\"," +
-                    "                                            \"fieldType\":\"string\"," +
-                    "                                            \"comparatorType\":\"Equals\"," +
-                    "                                            \"dataType\":\"user\"," +
-                    "                                            \"id\":6," +
-                    "                                            \"value\":\"gmail.com\"" +
-                    "                                        }" +
-                    "                                    ]" +
-                    "                                }" +
-                    "                            }," +
-                    "                            {" +
-                    "                                \"dataType\":\"customEvent\"," +
-                    "                                \"searchCombo\":{" +
-                    "                                    \"combinator\":\"And\"," +
-                    "                                    \"searchQueries\":[" +
-                    "                                        {" +
-                    "                                            \"field\":\"eventName\"," +
-                    "                                            \"fieldType\":\"string\"," +
-                    "                                            \"comparatorType\":\"Equals\"," +
-                    "                                            \"dataType\":\"customEvent\"," +
-                    "                                            \"id\":9," +
-                    "                                            \"value\":\"processing_cancelled\"" +
-                    "                                        }," +
-                    "                                        {" +
-                    "                                            \"field\":\"createdAt\"," +
-                    "                                            \"fieldType\":\"date\"," +
-                    "                                            \"comparatorType\":\"GreaterThan\"," +
-                    "                                            \"dataType\":\"customEvent\"," +
-                    "                                            \"id\":10," +
-                    "                                            \"dateRange\":{" +
-                    "                                            }," +
-                    "                                            \"isRelativeDate\":false," +
-                    "                                            \"value\":\"1688194800000\"" +
-                    "                                        }" +
-                    "                                    ]" +
-                    "                                }" +
-                    "                            }" +
-                    "                        ]" +
-                    "                    }" +
-                    "                ]" +
-                    "            }" +
-                    "        }" +
-                    "    ]" +
-                    "}";
-
-            JSONObject mockDataObject = new JSONObject(mockData);
-            SharedPreferences sharedPref = IterableApi.sharedInstance.getMainActivityContext().getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = sharedPref.edit();
-            editor.putString(IterableConstants.SHARED_PREFS_CRITERIA, mockDataObject.toString());
-            editor.apply();
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
+        IterableApi.getInstance().apiClient.getCriteriaList(data -> {
+            if (data != null) {
+                try {
+                    JSONObject mockDataObject = new JSONObject(data);
+                    SharedPreferences sharedPref = IterableApi.sharedInstance.getMainActivityContext().getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
+                    SharedPreferences.Editor editor = sharedPref.edit();
+                    editor.putString(IterableConstants.SHARED_PREFS_CRITERIA, mockDataObject.toString());
+                    editor.apply();
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
     }
 
-    private boolean checkCriteriaCompletion() {
+    private Integer checkCriteriaCompletion() {
         SharedPreferences sharedPref = IterableApi.sharedInstance.getMainActivityContext().getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
         String criteriaData = sharedPref.getString(IterableConstants.SHARED_PREFS_CRITERIA, "");
         JSONArray localStoredEventList = getEventListFromLocalStorage();
@@ -240,24 +156,29 @@ private boolean checkCriteriaCompletion() {
         try {
             if (!criteriaData.isEmpty() && localStoredEventList.length() > 0) {
                 CriteriaCompletionChecker checker = new CriteriaCompletionChecker();
-                return checker.getMatchedCriteria(criteriaData, localStoredEventList) != null;
+                return checker.getMatchedCriteria(criteriaData, localStoredEventList);
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
 
-        return false;
+        return null;
     }
 
-    private void createKnownUser() {
-        IterableApi.getInstance().setUserId(UUID.randomUUID().toString());
+    private void createKnownUser(Integer criteriaId) {
         SharedPreferences sharedPref = IterableApi.sharedInstance.getMainActivityContext().getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
         String userData = sharedPref.getString(IterableConstants.SHARED_PREFS_ANON_SESSIONS, "");
+        IterableApi.getInstance().setUserId(UUID.randomUUID().toString());
 
         try {
             if (!userData.isEmpty()) {
-                JSONObject userDataJson = new JSONObject(userData);
-                IterableApi.getInstance().updateUser(userDataJson);
+                JSONObject userSessionDataJson = new JSONObject(userData);
+                JSONObject userDataJson = userSessionDataJson.getJSONObject(IterableConstants.SHARED_PREFS_ANON_SESSIONS);
+                if (!getPushStatus().isEmpty()) {
+                    userDataJson.put(IterableConstants.SHARED_PREFS_PUSH_OPT_IN, getPushStatus());
+                }
+                userDataJson.put(IterableConstants.SHARED_PREFS_CRITERIA_ID, criteriaId);
+                IterableApi.getInstance().apiClient.trackAnonSession(getCurrentTime(), userDataJson);
             }
 
         } catch (JSONException e) {
@@ -326,6 +247,10 @@ void syncEvents() {
                             IterableApi.getInstance().updateCart(list, userObject, createdAt);
                             break;
                         }
+                        case IterableConstants.UPDATE_USER: {
+                            IterableApi.getInstance().updateUser(event.getJSONObject(IterableConstants.DATA_REPLACE));
+                            break;
+                        }
                         default:
                             break;
                     }
@@ -347,15 +272,47 @@ private void clearLocallyStoredData() {
     }
 
     private void storeEventListToLocalStorage(JSONObject newDataObject) {
+        storeEventListToLocalStorage(newDataObject, false);
+    }
+
+    private void storeEventListToLocalStorage(JSONObject newDataObject, boolean shouldOverWrite) {
         JSONArray previousDataArray = getEventListFromLocalStorage();
+        try {
+            if (shouldOverWrite) {
+                int indexToRemove = -1;
+                String trackingType = newDataObject.getString(IterableConstants.SHARED_PREFS_EVENT_TYPE);
+                for (int i = 0; i < previousDataArray.length(); i++) {
+                    JSONObject jsonObject = previousDataArray.getJSONObject(i);
+                    if (jsonObject.getString(IterableConstants.SHARED_PREFS_EVENT_TYPE).equals(trackingType)) {
+                        indexToRemove = i;
+                        break;
+                    }
+                }
+
+                if (indexToRemove >= 0) {
+                    JSONArray newDataArray = new JSONArray();
+                    for (int j = 0; j < previousDataArray.length(); j++) {
+                        if (j != indexToRemove) {
+                            newDataArray.put(previousDataArray.get(j));
+                        }
+                    }
+
+                    previousDataArray = newDataArray;
+                }
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
         previousDataArray.put(newDataObject);
         SharedPreferences sharedPref = IterableApi.sharedInstance.getMainActivityContext().getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = sharedPref.edit();
         editor.putString(IterableConstants.SHARED_PREFS_EVENT_LIST_KEY, previousDataArray.toString());
         editor.apply();
 
-        if (checkCriteriaCompletion()) {
-            createKnownUser();
+        Integer criteriaId = checkCriteriaCompletion();
+        if (criteriaId != null) {
+            createKnownUser(criteriaId);
         }
     }
 
@@ -378,9 +335,14 @@ private long getCurrentTime() {
         return Calendar.getInstance().getTimeInMillis();
     }
 
-    private String getCurrentDateTime() {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.getDefault());
-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return dateFormat.format(new Date());
+    private String getPushStatus() {
+        NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(IterableApi.getInstance().getMainActivityContext());
+        if (notificationManagerCompat.areNotificationsEnabled()) {
+            ApplicationInfo applicationInfo = IterableApi.sharedInstance.getMainActivityContext().getApplicationInfo();
+            int stringId = applicationInfo.labelRes;
+            return stringId == 0 ? applicationInfo.nonLocalizedLabel.toString() : IterableApi.sharedInstance.getMainActivityContext().getString(stringId);
+        } else {
+            return "";
+        }
     }
 }
\ No newline at end of file
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
index 0c0aefe73..a81e12b12 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java
@@ -661,7 +661,12 @@ public void setUserId(@Nullable String userId, @Nullable String authToken, @Null
         logoutPreviousUser();
 
         _email = null;
-        _userId = userId;
+        if (_userId == null) {
+            _userId = userId;
+            anonymousUserManager.syncEvents();
+        } else {
+            _userId = userId;
+        }
         _setUserSuccessCallbackHandler = successHandler;
         _setUserFailureCallbackHandler = failureHandler;
         storeAuthData();
@@ -1051,6 +1056,7 @@ public void updateUser(@NonNull JSONObject dataFields) {
      */
     public void updateUser(@NonNull JSONObject dataFields, Boolean mergeNestedObjects) {
         if (!checkSDKInitialization()) {
+            anonymousUserManager.trackAnonUpdateUser(dataFields);
             return;
         }
 
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
index 57b9035b8..793d51dda 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableApiClient.java
@@ -664,4 +664,21 @@ void mergeUser(String sourceEmail, String sourceUserId, String destinationEmail,
             e.printStackTrace();
         }
     }
+
+    void getCriteriaList(@Nullable IterableHelper.IterableActionHandler actionHandler) {
+        sendGetRequest(IterableConstants.ENDPOINT_CRITERIA_LIST, new JSONObject(), actionHandler);
+    }
+
+    void trackAnonSession(long createdAt, @NonNull JSONObject requestJson) {
+        try {
+            JSONObject requestObject = new JSONObject();
+            addEmailOrUserIdToJson(requestObject);
+            requestObject.put(IterableConstants.KEY_CREATED_AT, createdAt);
+            requestObject.put(IterableConstants.KEY_DEVICE_INFO, getDeviceInfoJson());
+            requestObject.put(IterableConstants.KEY_ANON_SESSION_CONTEXT, requestJson);
+            sendPostRequest(IterableConstants.ENDPOINT_TRACK_ANON_SESSION, requestObject);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
index 58a1a4a1e..9c7dd8210 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java
@@ -56,6 +56,7 @@ public final class IterableConstants {
     public static final String KEY_OFFLINE_MODE         = "offlineMode";
     public static final String KEY_FIRETV = "FireTV";
     public static final String KEY_CREATE_NEW_FIELDS    = "createNewFields";
+    public static final String KEY_ANON_SESSION_CONTEXT = "anonSessionContext";
 
     //API Endpoint Key Constants
     public static final String ENDPOINT_DISABLE_DEVICE          = "users/disableDevice";
@@ -79,6 +80,8 @@ public final class IterableConstants {
     public static final String ENDPOINT_GET_USER_BY_USERID      = "users/byUserId";
     public static final String ENDPOINT_GET_USER_BY_EMAIL       = "users/getByEmail";
     public static final String ENDPOINT_MERGE_USER              = "users/merge";
+    public static final String ENDPOINT_CRITERIA_LIST           = "anonymoususer/list";
+    public static final String ENDPOINT_TRACK_ANON_SESSION      = "anonymoususer/events/session";
 
     public static final String PUSH_APP_ID                      = "IterableAppId";
     public static final String PUSH_GCM_PROJECT_NUMBER          = "GCMProjectNumber";
@@ -119,14 +122,13 @@ public final class IterableConstants {
     public static final String SHARED_PREFS_OFFLINE_MODE_KEY = "itbl_offline_mode";
     public static final String SHARED_PREFS_EVENT_LIST_KEY = "itbl_event_list";
     public static final String SHARED_PREFS_ANON_SESSIONS = "itbl_anon_sessions";
-    public static final String SHARED_PREFS_SESSION_NO = "number_of_sessions";
-    public static final String SHARED_PREFS_LAST_SESSION = "last_session";
-    public static final String SHARED_PREFS_FIRST_SESSION = "first_session";
-    public static final String SHARED_PREFS_EVENT_TYPE = "dataType";
+    public static final String SHARED_PREFS_SESSION_NO = "totalAnonSessionCount";
+    public static final String SHARED_PREFS_LAST_SESSION = "lastAnonSession";
+    public static final String SHARED_PREFS_FIRST_SESSION = "firstAnonSession";
+    public static final String SHARED_PREFS_EVENT_TYPE = "eventType";
     public static final String SHARED_PREFS_CRITERIA = "criteria";
-    public static final String SHARED_PREFS_CRITERIA_LIST = "criteriaList";
-    public static final String SHARED_PREFS_CRITERIA_TYPE = "dataType";
-    public static final String SHARED_PREFS_AGGREGATE_COUNT = "aggregateCount";
+    public static final String SHARED_PREFS_CRITERIA_ID = "matchedCriteriaId";
+    public static final String SHARED_PREFS_PUSH_OPT_IN = "mobilePushOptIn";
 
     //Action buttons
     public static final String ITBL_BUTTON_IDENTIFIER        = "identifier";
@@ -167,6 +169,7 @@ public final class IterableConstants {
     public static final String REQUEST_CODE             = "requestCode";
     public static final String ACTION_IDENTIFIER        = "actionIdentifier";
     public static final String USER_INPUT               = "userInput";
+    public static final String DATA_REPLACE             = "dataReplace";
 
     //Firebase
     public static final String FIREBASE_SENDER_ID       = "gcm_defaultSenderId";
@@ -268,10 +271,11 @@ public final class IterableConstants {
     public static final String NO_MESSAGES_BODY = "noMessagesBody";
 
     //Tracking types
-    public static final String TRACK_EVENT = "track";
+    public static final String TRACK_EVENT = "customEvent";
     public static final String TRACK_PURCHASE = "purchase";
     public static final String TRACK_UPDATE_CART = "cartUpdate";
     public static final String TRACK_TOKEN_REGISTRATION = "tokenRegistration";
+    public static final String UPDATE_USER = "updateUser";
 
     public static final String ANON_USER_ID = "userId";
     public static  final String ANON_USER_EMAIL = "email";
diff --git a/iterableapi/src/main/java/com/iterable/iterableapi/util/CriteriaCompletionChecker.java b/iterableapi/src/main/java/com/iterable/iterableapi/util/CriteriaCompletionChecker.java
index f5e714fd3..cc28a6a78 100644
--- a/iterableapi/src/main/java/com/iterable/iterableapi/util/CriteriaCompletionChecker.java
+++ b/iterableapi/src/main/java/com/iterable/iterableapi/util/CriteriaCompletionChecker.java
@@ -22,34 +22,57 @@ public Integer getMatchedCriteria(String criteriaData, JSONArray localStoredEven
 
         try {
             JSONObject json = new JSONObject(criteriaData);
-            if (json.has("criteriaList")) {
-                JSONArray criteriaList = json.getJSONArray("criteriaList");
-                for (int i = 0; i < criteriaList.length(); i++) {
-                    JSONObject criteria = criteriaList.getJSONObject(i);
-                    if (criteria.has("searchQuery") && criteria.has("criteriaId")) {
-
-                        JSONObject searchQuery = criteria.getJSONObject("searchQuery");
-                        int currentCriteriaId = criteria.getInt("criteriaId");
-                        JSONArray eventsToProcess = getEventsWithCartItems();
-                        JSONArray nonPurchaseEvents = getNonCartEvents();
-                        for (int j = 0; j < nonPurchaseEvents.length(); j++) {
-                            eventsToProcess.put(nonPurchaseEvents.getJSONObject(j));
-                        }
+            if (json.has("criterias")) {
+                JSONArray criteriaList = json.getJSONArray("criterias");
+                criteriaId = findMatchedCriteria(criteriaList);
+            }
+        } catch (JSONException e) {
+            handleJSONException(e);
+        }
 
-                        boolean result = evaluateTree(searchQuery, eventsToProcess);
-                        if (result) {
-                            criteriaId = currentCriteriaId;
-                            break;
-                        }
+        return criteriaId;
+    }
+
+    private Integer findMatchedCriteria(JSONArray criteriaList) {
+        Integer criteriaId = null;
+
+        for (int i = 0; i < criteriaList.length(); i++) {
+            try {
+                JSONObject criteria = criteriaList.getJSONObject(i);
+                if (criteria.has("searchQuery") && criteria.has("criteriaId")) {
+                    JSONObject searchQuery = criteria.getJSONObject("searchQuery");
+                    int currentCriteriaId = criteria.getInt("criteriaId");
+                    JSONArray eventsToProcess = prepareEventsToProcess();
+
+                    boolean result = evaluateTree(searchQuery, eventsToProcess);
+                    if (result) {
+                        criteriaId = currentCriteriaId;
+                        break;
                     }
                 }
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
             }
-        } catch (JSONException e) {
-            handleJSONException(e);
         }
+
         return criteriaId;
     }
 
+    private JSONArray prepareEventsToProcess() {
+        JSONArray eventsToProcess = getEventsWithCartItems();
+        JSONArray nonPurchaseEvents = getNonCartEvents();
+
+        for (int i = 0; i < nonPurchaseEvents.length(); i++) {
+            try {
+                eventsToProcess.put(nonPurchaseEvents.getJSONObject(i));
+            } catch (JSONException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return eventsToProcess;
+    }
+
     private JSONArray getEventsWithCartItems() {
         JSONArray processedEvents = new JSONArray();
         try {