From 64146b98e8b0848913fb727d8c46a9a43c6a29ce Mon Sep 17 00:00:00 2001
From: swapnilWingify <swapnil.chaudhari@wingify.com>
Date: Tue, 5 Nov 2024 16:05:07 +0530
Subject: [PATCH] feat: MEG personalize and in-built storage support

---
 CHANGELOG.md                                  |  19 +-
 app/src/main/AndroidManifest.xml              |   3 +
 .../java/com/vwo/fme/JavaMainActivity.java    | 168 +++++
 app/src/main/java/com/vwo/fme/MainActivity.kt | 140 +++-
 app/src/main/java/com/vwo/fme/StorageTest.kt  |  73 ++
 app/src/main/res/layout/activity_main.xml     |  11 +
 app/src/main/res/values/strings.xml           |   1 +
 build.gradle                                  |   4 +-
 fme-android/build.gradle                      |  15 +-
 fme-android/proguard-rules.pro                |   3 +-
 .../src/main/assets/debug-messages.json       |   1 +
 .../src/main/assets/error-messages.json       |   6 +-
 fme-android/src/main/java/com/vwo/VWO.kt      |  28 +-
 .../src/main/java/com/vwo/VWOBuilder.kt       |  57 +-
 .../src/main/java/com/vwo/VWOClient.kt        |  15 +-
 .../src/main/java/com/vwo/api/GetFlagAPI.kt   |  86 ++-
 .../main/java/com/vwo/api/SetAttributeAPI.kt  |   1 +
 .../main/java/com/vwo/api/TrackEventAPI.kt    |   4 +-
 .../main/java/com/vwo/constants/Constants.kt  |   6 +-
 .../com/vwo/decorators/StorageDecorator.kt    |   2 +-
 .../src/main/java/com/vwo/enums/EventEnum.kt  |   4 +-
 .../src/main/java/com/vwo/enums/UrlEnum.kt    |   6 +-
 .../java/com/vwo/enums/VariableTypeEnum.kt    |  21 +
 .../java/com/vwo/interfaces/IVwoListener.java |  38 +
 .../src/main/java/com/vwo/models/Campaign.kt  |  11 +
 .../src/main/java/com/vwo/models/Groups.kt    |   7 +-
 .../java/com/vwo/models/RecommendedProduct.kt |  28 +
 .../src/main/java/com/vwo/models/Variable.kt  |   3 +
 .../src/main/java/com/vwo/models/Variation.kt |  11 +
 .../main/java/com/vwo/models/user/GetFlag.kt  |  38 +-
 .../com/vwo/models/user/Recommendation.kt     | 115 +++
 .../java/com/vwo/models/user/VWOContext.kt    |   1 +
 .../com/vwo/models/user/VWOInitOptions.kt     |   9 +-
 .../network_layer/client/ApiCallRepeater.kt   | 100 +++
 .../network_layer/client/NetworkClient.kt     | 176 +++--
 .../network_layer/manager/NetworkManager.kt   |  10 +-
 .../network_layer/models/RequestModel.kt      |   2 -
 .../core/SegmentationManager.kt               |  15 +-
 .../evaluators/SegmentEvaluator.kt            |   2 +-
 .../evaluators/SegmentOperandEvaluator.kt     |   2 +-
 .../vwo/packages/storage/DefaultStorage.kt    |  73 ++
 .../storage/LocalStorageController.kt         |  95 +++
 .../packages/storage/MobileDefaultStorage.kt  |  99 +++
 .../com/vwo/packages/storage/RequestStore.kt  | 108 +++
 .../com/vwo/packages/storage/SettingsStore.kt |  88 +++
 .../java/com/vwo/providers/StorageProvider.kt |  47 ++
 .../vwo/services/CampaignDecisionService.kt   |  62 +-
 .../java/com/vwo/services/SettingsManager.kt  |  86 ++-
 .../java/com/vwo/services/StorageService.kt   |   2 +-
 .../com/vwo/utils/AppLifecycleListener.kt     | 130 ++++
 .../main/java/com/vwo/utils/CampaignUtil.kt   | 107 ++-
 .../main/java/com/vwo/utils/DataTypeUtil.kt   |  12 +
 .../main/java/com/vwo/utils/DecisionUtil.kt   | 282 ++++++--
 .../main/java/com/vwo/utils/EventsUtils.kt    |  85 +++
 .../java/com/vwo/utils/GatewayServiceUtil.kt  |   6 +-
 .../main/java/com/vwo/utils/ImpressionUtil.kt |   1 +
 .../src/main/java/com/vwo/utils/MegUtil.kt    | 265 ++++---
 .../main/java/com/vwo/utils/NetworkUtil.kt    |  56 +-
 .../java/com/vwo/utils/RecommendationUtil.kt  | 102 +++
 .../java/com/vwo/utils/RuleEvaluationUtil.kt  |   2 +-
 .../main/java/com/vwo/utils/SettingsUtil.kt   |  32 +-
 .../src/main/java/com/vwo/utils/UUIDUtils.kt  | 102 ++-
 .../src/test/java/com/vwo/e2e/GetFlagTests.kt | 142 ++++
 .../packages/segmentor/AndOperatorTests.kt    | 183 +++++
 .../CaseInsensitiveEqualityOperandTests.kt    | 489 +++++++++++++
 .../packages/segmentor/CombinationTests.kt    | 679 ++++++++++++++++++
 .../segmentor/ContainsOperandTests.kt         | 457 ++++++++++++
 .../segmentor/EndsWithOperandTests.kt         | 501 +++++++++++++
 .../segmentor/EqualityOperandTests.kt         | 488 +++++++++++++
 .../GreaterThanEqualToOperatorTests.kt        |  94 +++
 .../segmentor/GreaterThanOperatorTests.kt     |  94 +++
 .../segmentor/LessThanEqualToOperatorTests.kt |  75 ++
 .../segmentor/LessThanOperatorTests.kt        |  94 +++
 .../packages/segmentor/NotOperatorTests.kt    | 563 +++++++++++++++
 .../vwo/packages/segmentor/OrOperatorTests.kt | 159 ++++
 .../com/vwo/packages/segmentor/RegexTests.kt  | 124 ++++
 .../packages/segmentor/SegmentorTestUtils.kt  |  29 +
 .../segmentor/StartsWithOperandTests.kt       | 451 ++++++++++++
 .../java/com/vwo/testcases/Expectation.kt     |  36 +
 .../test/java/com/vwo/testcases/TestCases.kt  |  32 +
 .../test/java/com/vwo/testcases/TestData.kt   |  26 +
 .../java/com/vwo/testcases/TestDataReader.kt  |  62 ++
 .../java/com/vwo/utils/DummySettingsReader.kt |  56 ++
 .../resources/BASIC_ROLLOUT_SETTINGS.json     |  73 ++
 .../BASIC_ROLLOUT_TESTING_RULE_SETTINGS.json  | 164 +++++
 .../MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS.json   | 639 ++++++++++++++++
 .../MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS.json    | 444 ++++++++++++
 ...NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS.json | 163 +++++
 ...OUT_TESTING_PRE_SEGMENT_RULE_SETTINGS.json | 329 +++++++++
 ...NG_WHITELISTING_SEGMENT_RULE_SETTINGS.json | 184 +++++
 .../test/resources/assets/debug-messages.json |  13 +
 .../test/resources/assets/error-messages.json |  27 +
 .../test/resources/assets/info-messages.json  |  31 +
 .../test/resources/assets/trace-messages.json |   1 +
 .../test/resources/assets/warn-messages.json  |   1 +
 fme-android/src/test/resources/index.json     | 587 +++++++++++++++
 .../src/test/resources/testData/index.json    | 587 +++++++++++++++
 gradle.properties                             |   6 +-
 98 files changed, 10728 insertions(+), 439 deletions(-)
 create mode 100644 app/src/main/java/com/vwo/fme/JavaMainActivity.java
 create mode 100644 app/src/main/java/com/vwo/fme/StorageTest.kt
 create mode 100644 fme-android/src/main/java/com/vwo/enums/VariableTypeEnum.kt
 create mode 100644 fme-android/src/main/java/com/vwo/interfaces/IVwoListener.java
 create mode 100644 fme-android/src/main/java/com/vwo/models/RecommendedProduct.kt
 create mode 100644 fme-android/src/main/java/com/vwo/models/user/Recommendation.kt
 create mode 100644 fme-android/src/main/java/com/vwo/packages/network_layer/client/ApiCallRepeater.kt
 create mode 100644 fme-android/src/main/java/com/vwo/packages/storage/DefaultStorage.kt
 create mode 100644 fme-android/src/main/java/com/vwo/packages/storage/LocalStorageController.kt
 create mode 100644 fme-android/src/main/java/com/vwo/packages/storage/MobileDefaultStorage.kt
 create mode 100644 fme-android/src/main/java/com/vwo/packages/storage/RequestStore.kt
 create mode 100644 fme-android/src/main/java/com/vwo/packages/storage/SettingsStore.kt
 create mode 100644 fme-android/src/main/java/com/vwo/providers/StorageProvider.kt
 create mode 100644 fme-android/src/main/java/com/vwo/utils/AppLifecycleListener.kt
 create mode 100644 fme-android/src/main/java/com/vwo/utils/EventsUtils.kt
 create mode 100644 fme-android/src/main/java/com/vwo/utils/RecommendationUtil.kt
 create mode 100644 fme-android/src/test/java/com/vwo/e2e/GetFlagTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/AndOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/CaseInsensitiveEqualityOperandTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/CombinationTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/ContainsOperandTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/EndsWithOperandTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/EqualityOperandTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanEqualToOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/LessThanEqualToOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/LessThanOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/NotOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/OrOperatorTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/RegexTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/SegmentorTestUtils.kt
 create mode 100644 fme-android/src/test/java/com/vwo/packages/segmentor/StartsWithOperandTests.kt
 create mode 100644 fme-android/src/test/java/com/vwo/testcases/Expectation.kt
 create mode 100644 fme-android/src/test/java/com/vwo/testcases/TestCases.kt
 create mode 100644 fme-android/src/test/java/com/vwo/testcases/TestData.kt
 create mode 100644 fme-android/src/test/java/com/vwo/testcases/TestDataReader.kt
 create mode 100644 fme-android/src/test/java/com/vwo/utils/DummySettingsReader.kt
 create mode 100644 fme-android/src/test/resources/BASIC_ROLLOUT_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/BASIC_ROLLOUT_TESTING_RULE_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS.json
 create mode 100644 fme-android/src/test/resources/assets/debug-messages.json
 create mode 100644 fme-android/src/test/resources/assets/error-messages.json
 create mode 100644 fme-android/src/test/resources/assets/info-messages.json
 create mode 100644 fme-android/src/test/resources/assets/trace-messages.json
 create mode 100644 fme-android/src/test/resources/assets/warn-messages.json
 create mode 100644 fme-android/src/test/resources/index.json
 create mode 100644 fme-android/src/test/resources/testData/index.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29823b9..0e58bd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,24 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-[0.1.0] - 2024-07-31
+## [1.0.0] - 2024-11-11
 
 ### Added
+
+- Added support for Personalise rules within `Mutually Exclusive Groups`.
+- Settings cache: Cached settings will be used till it expires. Client can set the expiry time of cache.
+- Storage support: Built-in local storage will be used by default if client doesn't provide their own. Client’s storage will be used if it is provided.
+- Call backs added to avoid busy waiting for server call to complete.
+- Changed variable access to method access for Flag - setIsEnabled & isEnabled
+
+## [0.1.0] - 2024-07-31
+
+### Added
+
 - First release of VWO Feature Management and Experimentation capabilities.
 
     ```kotlin
@@ -53,9 +65,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
             Log.d("Vwo", "vwoInitFailed: $message")
         }
     })
-
-     ```
+    ```
 
 - **Error handling**
 
-    - Gracefully handle any kind of error - TypeError, NetworkError, etc. 
\ No newline at end of file
+  - Gracefully handle any kind of error - TypeError, NetworkError, etc.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9534303..24375ac 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.FME"
         tools:targetApi="31">
+        <!--Use android:usesCleartextTraffic="true" to test with http servers like gateways-->
         <activity
             android:name=".MainActivity"
             android:exported="true">
@@ -21,6 +22,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".JavaMainActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/vwo/fme/JavaMainActivity.java b/app/src/main/java/com/vwo/fme/JavaMainActivity.java
new file mode 100644
index 0000000..a07a7df
--- /dev/null
+++ b/app/src/main/java/com/vwo/fme/JavaMainActivity.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.fme;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.vwo.VWO;
+import com.vwo.fme.databinding.ActivityMainBinding;
+import com.vwo.interfaces.IVwoInitCallback;
+import com.vwo.interfaces.IVwoListener;
+import com.vwo.models.user.GetFlag;
+import com.vwo.models.user.VWOContext;
+import com.vwo.models.user.VWOInitOptions;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class JavaMainActivity extends AppCompatActivity {
+
+    TestApp prod = new TestApp(0,
+            "",
+            "flag-name",
+            "variable-name",
+            "event-name",
+            "attribute-name");
+
+    TestApp server = prod;
+    String SDK_KEY = server.getSdkKey();
+    int ACCOUNT_ID = server.getAccountId();
+
+    private VWO vwo;
+    private GetFlag featureFlag;
+    private VWOContext userContext;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ActivityMainBinding binding = ActivityMainBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        binding.tvName.setText("FME Java");
+
+        binding.btnInitSdk.setOnClickListener(view -> {
+            VWOInitOptions vwoInitOptions = new VWOInitOptions();
+            vwoInitOptions.setSdkKey(SDK_KEY);
+            vwoInitOptions.setAccountId(ACCOUNT_ID);
+
+            Map<String, Object> loggerOptions = new HashMap<>();
+            loggerOptions.put("level", "TRACE");
+            vwoInitOptions.setLogger(loggerOptions);
+
+            VWO.init(vwoInitOptions, new IVwoInitCallback() {
+                @Override
+                public void vwoInitSuccess(@NonNull VWO vwo, @NonNull String message) {
+                    Log.d("Flag", "vwoInitSuccess " + message);
+                    JavaMainActivity.this.vwo = vwo;
+                }
+
+                @Override
+                public void vwoInitFailed(@NonNull String message) {
+                    Log.d("Flag", "vwoInitFailed: " + message);
+                }
+            });
+        });
+        binding.btnGetFlag.setOnClickListener(v -> {
+            if (vwo != null) {
+                getFlag(vwo);
+            }
+        });
+
+        binding.btnGetVariable.setOnClickListener(v -> {
+            if (featureFlag != null) {
+                getVariable(featureFlag);
+            }
+        });
+
+        binding.btnTrack.setOnClickListener(v -> track());
+
+        binding.btnAttribute.setOnClickListener(v -> sendAttribute());
+        binding.btnJavaScreen.setVisibility(View.GONE);
+    }
+
+    private void getFlag(@NonNull VWO vwo) {
+        userContext = new VWOContext();
+        userContext.setId("unique_user_id");
+
+        Map<String, Object> customVariables = new HashMap<>();
+        customVariables.put("Username", "Swapnil");
+        customVariables.put("userType", "trial");
+        userContext.setCustomVariables(customVariables);
+
+        vwo.getFlag("feature-key", userContext, new IVwoListener() {
+            public void onSuccess(Object data) {
+                featureFlag = (GetFlag) data;
+                if (featureFlag != null) {
+                    boolean isFeatureFlagEnabled = featureFlag.isEnabled();
+                    Log.d("FME-App", "Received getFlag isFeatureFlagEnabled=" + isFeatureFlagEnabled);
+                }
+            }
+
+            public void onFailure(@NonNull String message) {
+                Log.d("FME-App", "getFlag " + message);
+            }
+        });
+        if (featureFlag == null)
+            return;
+        boolean isFeatureFlagEnabled = featureFlag.isEnabled();
+
+        Log.d("Flag", "isFeatureFlagEnabled=" + isFeatureFlagEnabled);
+    }
+
+    private void getVariable(@NonNull GetFlag featureFlag) {
+        boolean isFeatureFlagEnabled = featureFlag.isEnabled();
+        Log.d("Flag", "isFeatureFlagEnabled=" + isFeatureFlagEnabled);
+
+        if (isFeatureFlagEnabled) {
+            String variable1 = (String) featureFlag.getVariable("variable_key", "default-value1");
+
+            List<Map<String, Object>> getAllVariables = featureFlag.getVariables();
+            Log.d("Flag", "variable1=" + variable1 + " getAllVariables=" + getAllVariables);
+        } else {
+            Log.d("Flag", "Feature flag is disabled: " + featureFlag.isEnabled() + " " + featureFlag.getVariables());
+        }
+    }
+
+    private void track() {
+        if (userContext == null) return;
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("cartvalue", 120);
+        properties.put("productCountInCart", 2);
+
+        // Track the event for the given event name, user context and properties
+        Map<String, Boolean> trackResponse = vwo.trackEvent("productViewed", userContext, properties);
+        Log.d("Flag", "track=" + trackResponse);
+        // Track the event for the given event name and user context
+        //Map<String, Boolean> trackResponse = vwo.trackEvent("vwoevent", userContext);
+    }
+
+    private void sendAttribute() {
+        if (vwo != null) {
+            vwo.setAttribute("userType", "paid", userContext);
+            vwo.setAttribute("attribute-name-float", 1.01, userContext);
+            vwo.setAttribute("attribute-name-boolean", true, userContext);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/vwo/fme/MainActivity.kt b/app/src/main/java/com/vwo/fme/MainActivity.kt
index 7629d14..8d265ce 100644
--- a/app/src/main/java/com/vwo/fme/MainActivity.kt
+++ b/app/src/main/java/com/vwo/fme/MainActivity.kt
@@ -1,22 +1,37 @@
 package com.vwo.fme
 
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.vwo.VWO
 import com.vwo.fme.databinding.ActivityMainBinding
 import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.interfaces.IVwoListener
 import com.vwo.models.user.GetFlag
+import com.vwo.models.user.Recommendation
 import com.vwo.models.user.VWOContext
 import com.vwo.models.user.VWOInitOptions
+import com.vwo.services.LoggerService
 
+val prod = TestApp(
+    accountId = 0,
+    sdkKey = "",
+    flagName = "",
+    variableName = "",
+    eventName = "",
+    attributeName = ""
+)
 
-private const val SDK_KEY = ""
-private const val ACCOUNT_ID = 0
+val server = prod
+private val SDK_KEY = server.sdkKey
+private val ACCOUNT_ID = server.accountId
 
 class MainActivity : AppCompatActivity() {
 
+    private val USER_ID = ""
     private var vwo: VWO? = null
     private var featureFlag: GetFlag? = null
     private lateinit var userContext: VWOContext
@@ -37,8 +52,16 @@ class MainActivity : AppCompatActivity() {
             // Set SDK Key and Account ID
             vwoInitOptions.sdkKey = SDK_KEY
             vwoInitOptions.accountId = ACCOUNT_ID
+            vwoInitOptions.context = this@MainActivity.applicationContext
 
             vwoInitOptions.logger = mutableMapOf<String, Any>().apply { put("level", "TRACE") }
+            /*vwoInitOptions.gatewayService = mutableMapOf<String, Any>().apply {
+                    put("url", "http://10.0.2.2:8000")
+                }*/
+            //vwoInitOptions.pollInterval = 60000
+            vwoInitOptions.cachedSettingsExpiryTime = 2 * 60 * 1000 // 2 min
+
+            //vwoInitOptions.storage = StorageTest()
             // Create VWO instance with the vwoInitOptions
             VWO.init(vwoInitOptions, object : IVwoInitCallback {
                 override fun vwoInitSuccess(vwo: VWO, message: String) {
@@ -50,24 +73,30 @@ class MainActivity : AppCompatActivity() {
                     // Log error here
                 }
             })
-            binding.btnGetFlag.setOnClickListener {
-                vwo?.let { getFlag(it) }
-            }
-            binding.btnGetVariable.setOnClickListener {
-                featureFlag?.let { getVariable(it) }
-            }
-            binding.btnTrack.setOnClickListener {
-                track()
-            }
-            binding.btnAttribute.setOnClickListener {
-                sendAttribute()
-            }
+        }
+        binding.btnGetFlag.setOnClickListener {
+            vwo?.let { getFlag(it) }
+        }
+        binding.btnGetVariable.setOnClickListener {
+            featureFlag?.let { getVariable(it) }
+        }
+        binding.btnTrack.setOnClickListener {
+            track()
+        }
+        binding.btnAttribute.setOnClickListener {
+            sendAttribute()
+        }
+        binding.btnJavaScreen.setOnClickListener {
+            startActivity(Intent(this, JavaMainActivity::class.java))
         }
     }
 
     private fun getFlag(vwo: VWO) {
         userContext = VWOContext()
-        userContext.id = "unique_user_id"
+        userContext.id = USER_ID
+        userContext.ipAddress = "182.69.183.212"
+        //userContext.userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36"
+        userContext.userAgent = "AppName/1.0 (Linux; Android 12; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Mobile Safari/537.36"
         userContext.customVariables = mutableMapOf(
             "name1" to 21,
             "name2" to 0,
@@ -76,42 +105,105 @@ class MainActivity : AppCompatActivity() {
         )
 
         // Get feature flag object
-        featureFlag = vwo.getFlag("feature_flag_name", userContext)
+        vwo.getFlag(server.flagName, userContext, object : IVwoListener {
+            override fun onSuccess(data: Any) {
+                featureFlag = data as? GetFlag
+                val isFeatureFlagEnabled = featureFlag?.isEnabled()
+                Log.d("FME-App", "Received getFlag isFeatureFlagEnabled=$isFeatureFlagEnabled")
+            }
 
-        val isFeatureFlagEnabled = featureFlag?.isEnabled
+            override fun onFailure(message: String) {
+                Log.d("FME-App", "getFlag $message")
+            }
+        })
     }
 
     private fun getVariable(featureFlag: GetFlag) {
-        val isFeatureFlagEnabled = featureFlag.isEnabled
+        val isFeatureFlagEnabled = featureFlag.isEnabled()
 
         // Determine the application flow based on feature flag status
         if (isFeatureFlagEnabled) {
             // To get value of a single variable
-            val variable1 = featureFlag.getVariable("feature_flag_variable1", "default-value1")
-            val variable2 = featureFlag.getVariable("feature_flag_variable2", "default-value2")
+            recommendation(featureFlag)
+            val variable2 = featureFlag.getVariable(server.variableName, "default-value2")
 
             // To get value of all variables in object format
             val getAllVariables = featureFlag.getVariables()
+            println("Variable values: getAllVariables=$getAllVariables")
         } else {
             // Your code when feature flag is disabled
         }
     }
 
+    private fun recommendation(featureFlag: GetFlag) {
+
+        val recommendationWrapper = featureFlag.getVariable(server.variableName, "default")
+
+        if (recommendationWrapper is Recommendation) {
+            val options = mapOf<String, Any>(
+                "userId" to USER_ID,
+                "productIds" to "1,2,3,4",
+                "pageType" to "shopping-cart-page-view"
+            )
+            recommendationWrapper.getRecommendations(
+                options,
+                category = "Clothing",
+                productIds = listOf(1501),
+                object : IVwoListener {
+
+                    override fun onSuccess(data: Any) {
+                        println("response is -- $data")
+                    }
+
+                    override fun onFailure(message: String) {
+                        println("error is -- $message")
+                    }
+                })
+            recommendationWrapper.getRecommendationWidget(
+                featureFlag,
+                emptyMap(),
+                object : IVwoListener {
+                    override fun onSuccess(data: Any) {
+                        println("getRecommendationWidget response is -- $data")
+                    }
+
+                    override fun onFailure(message: String) {
+                        println("getRecommendationWidget error is -- $message")
+                    }
+                })
+            println("RecommendationBlock=${recommendationWrapper.recommendationBlock}")
+        }
+    }
+
     private fun track() {
 
         if (!::userContext.isInitialized) return
 
         val properties = mutableMapOf<String, Any>("cartvalue" to 10)
         // Track the event for the given event name and user context
-        val trackResponse = vwo?.trackEvent("vwoevent", userContext, properties)
-        //val trackResponse = vwo?.trackEvent("vwoevent", userContext)
+        val map: MutableMap<String, Any> = mutableMapOf()
+        map["category"] = "electronics"
+        map["isWishlisted"] = false
+        map["price"] = 21
+        map["productId"] = 1
+        val trackResponse = vwo?.trackEvent(server.eventName, userContext, map)
+        //val trackResponse = vwo?.trackEvent(server.eventName, userContext)
     }
 
     private fun sendAttribute() {
         if (!::userContext.isInitialized) return
 
-        vwo?.setAttribute("attribute-name", "attribute-value1", userContext)
+        vwo?.setAttribute(server.attributeName, "attribute-value1", userContext)
         vwo?.setAttribute("attribute-name-float", 1.01, userContext)
         vwo?.setAttribute("attribute-name-boolean", true, userContext)
     }
-}
\ No newline at end of file
+}
+
+data class TestApp(
+    val accountId: Int,
+    val sdkKey: String,
+    val flagName: String,
+    val variableName: String,
+    val eventName: String,
+    val attributeName: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/vwo/fme/StorageTest.kt b/app/src/main/java/com/vwo/fme/StorageTest.kt
new file mode 100644
index 0000000..1923eb5
--- /dev/null
+++ b/app/src/main/java/com/vwo/fme/StorageTest.kt
@@ -0,0 +1,73 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.fme
+
+import com.vwo.packages.storage.Connector
+
+/**
+ * A class for storing and retrieving data from a storage.
+ */
+class StorageTest : Connector() {
+    /**
+     * A In-memory mutable map to store the data.
+     * The keys are strings representing a combination of feature key and user ID.
+     * The values are maps containing the data for each key.
+     */
+    private val storage: MutableMap<String, Map<String, Any?>> = HashMap()
+
+    /**
+     * Stores the data in the storage.
+     *
+     * @param data A map containing the data to be stored.
+     * The map should contain the following keys:
+     * - "featureKey": The feature key for the data.
+     * - "user": The user ID for the data.
+     * - "rolloutKey": The rollout key for the data.
+     * - "rolloutVariationId": The rollout variation ID for the data.
+     * - "experimentKey": The experimentkey for the data.
+     * - "experimentVariationId": The experiment variation ID for the data.
+     */
+    override fun set(data: Map<String, Any>) {
+        val key = data["featureKey"].toString() + "_" + data["userId"]
+
+        // Create a map to store the data
+        val value: MutableMap<String, Any?> = HashMap()
+        value["rolloutKey"] = data["rolloutKey"]
+        value["rolloutVariationId"] = data["rolloutVariationId"]
+        value["experimentKey"] = data["experimentKey"]
+        value["experimentVariationId"] = data["experimentVariationId"]
+
+        // Store the value in the storage
+        storage[key] = value
+    }
+
+    /**
+     * Retrieves the data from the storage.
+     *
+     * @param featureKey The feature key for the data.
+     * @param userId The user ID for the data.
+     * @return The data if found, or null otherwise.
+     */
+    override fun get(featureKey: String?, userId: String?): Any? {
+        val key = featureKey + "_" + userId
+
+        // Check if the key exists in the storage
+        if (storage.containsKey(key)) {
+            return storage[key]
+        }
+        return null
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 60eed50..4459418 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,6 +8,7 @@
     tools:context=".MainActivity">
 
     <TextView
+        android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/app_name"
@@ -64,6 +65,16 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:text="@string/attribute"
+        app:layout_constraintBottom_toTopOf="@+id/btn_java_screen"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/btn_java_screen"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:text="@string/javaScreen"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8afbb80..455af89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,4 +5,5 @@
     <string name="getVariable">Get Variable</string>
     <string name="track">Track</string>
     <string name="attribute">Attribute</string>
+    <string name="javaScreen">Show Java screen</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d7e6aa9..d85f750 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        compose_version = '1.1.0-beta01'
+        compose_version = '1.0.0-beta01'
     }
     ext.kotlin_version = '1.5.31'
     repositories {
@@ -19,4 +19,4 @@ plugins {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/fme-android/build.gradle b/fme-android/build.gradle
index 368cd75..219843a 100644
--- a/fme-android/build.gradle
+++ b/fme-android/build.gradle
@@ -19,7 +19,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
-
+    sourceSets {
+        test {
+            resources.srcDirs 'src/test/resources'
+        }
+    }
     buildTypes {
         release {
             minifyEnabled true
@@ -122,9 +126,18 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.3'
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
+    implementation("com.google.guava:guava:32.1.2-jre")
+
+    implementation "androidx.work:work-runtime-ktx:2.7.0"
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation("com.github.eprst:murmur3:0.4.3")
+    testImplementation 'org.mockito:mockito-core:4.8.0'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
+    testImplementation 'org.mockito:mockito-inline:4.8.0'
+    testImplementation 'com.fasterxml.jackson.core:jackson-core:2.10.3'
+    testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.3'
+    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.10.3'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
\ No newline at end of file
diff --git a/fme-android/proguard-rules.pro b/fme-android/proguard-rules.pro
index 6a16595..7abb4d5 100644
--- a/fme-android/proguard-rules.pro
+++ b/fme-android/proguard-rules.pro
@@ -23,10 +23,11 @@
 -renamesourcefileattribute SourceFile
 -keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
 
--repackageclasses 'secret'
+-repackageclasses 'fme'
 -allowaccessmodification
 -keeppackagenames doNotKeepAThing
 
 -keep class com.vwo.VWO { *; }
 -keep class com.vwo.interfaces.IVwoInitCallback { *; }
+-keep class com.vwo.interfaces.IVwoListener { *; }
 -keep class com.vwo.models.** { *; }
\ No newline at end of file
diff --git a/fme-android/src/main/assets/debug-messages.json b/fme-android/src/main/assets/debug-messages.json
index c36b139..ed70b1b 100644
--- a/fme-android/src/main/assets/debug-messages.json
+++ b/fme-android/src/main/assets/debug-messages.json
@@ -9,5 +9,6 @@
 
   "IMPRESSION_FOR_TRACK_USER": "Impression built for vwo_variationShown event for Account ID:{accountId}, User ID:{userId}, and experiment ID:{campaignId}",
   "IMPRESSION_FOR_TRACK_GOAL": "Impression built for {eventName} event for Account ID:{accountId}, and user ID:{userId}",
+  "IMPRESSION_FOR_GET_RECOMMENDATION": "Getting Recommendations for Account ID:{accountId}, and user ID:{userId}",
   "IMPRESSION_FOR_SYNC_VISITOR_PROP": "Impression built for {eventName} event for Account ID:{accountId}, and user ID:{userId}"
 }
\ No newline at end of file
diff --git a/fme-android/src/main/assets/error-messages.json b/fme-android/src/main/assets/error-messages.json
index 916ef40..17e1168 100644
--- a/fme-android/src/main/assets/error-messages.json
+++ b/fme-android/src/main/assets/error-messages.json
@@ -23,5 +23,9 @@
 
   "GATEWAY_URL_ERROR": "Please provide a valid URL for VWO Gateway Service",
 
-  "NETWORK_CALL_FAILED": "Error occurred while sending {method} request. Error: {err}"
+  "NETWORK_CALL_FAILED": "Error occurred while sending {method} request. Error: {err}",
+
+  "RECOMMENDATION_ERROR": "Error occurred while fetching recommendations. Error: {err}",
+
+  "PARSING_ERROR": "Error while parsing request data, it is not in the expected format. Error: {err}"
 }
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/VWO.kt b/fme-android/src/main/java/com/vwo/VWO.kt
index 956ab7e..be3d2ca 100644
--- a/fme-android/src/main/java/com/vwo/VWO.kt
+++ b/fme-android/src/main/java/com/vwo/VWO.kt
@@ -16,14 +16,14 @@
 package com.vwo
 
 import com.vwo.interfaces.IVwoInitCallback
-import com.vwo.models.user.GetFlag
+import com.vwo.packages.network_layer.client.ApiCallRepeater
+import com.vwo.interfaces.IVwoListener
 import com.vwo.models.user.VWOContext
 import com.vwo.models.user.VWOInitOptions
-import com.vwo.utils.LogMessageUtil.buildMessage
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import kotlin.concurrent.thread
 
 /**
  *  VWO (Visual Website Optimizer) is a powerful A/B testing and experimentation platform.
@@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
  */
 object VWO {
     private var instance: VWO? = null
-    private var vwoClient: VWOClient? = null
+    internal var vwoClient: VWOClient? = null
 
     /**
      * Sets the singleton instance of VWO.
@@ -45,7 +45,10 @@ object VWO {
     private fun setInstance(options: VWOInitOptions): VWO {
 
         val vwoBuilder: VWOBuilder = options.vwoBuilder ?: VWOBuilder(options)
-        vwoBuilder.setLogger() // Sets up logging for debugging and monitoring.
+        vwoBuilder.setLogger()
+            .setContext()
+            //.setLifeCycleListener() // Sets app life cycle listener to trigger any pending API calls
+            .setSharePreferences()// Sets up local storage for saving settings
             .setSettingsManager() // Sets the settings manager for configuration management.
             .setStorage() // Configures storage for data persistence.
             .setNetworkManager() // Configures network management for API communication.
@@ -87,6 +90,7 @@ object VWO {
 
             instance = setInstance(options)
             instance?.let { initListener.vwoInitSuccess(it, "VWO initialized successfully") }
+            //ApiCallRepeater.start()
         }
     }
 
@@ -104,8 +108,18 @@ object VWO {
      * @param context User context
      * @return GetFlag object containing the flag values
      */
-    fun getFlag(featureKey: String, ctx: VWOContext): GetFlag? {
-        return vwoClient?.getFlag(featureKey, ctx)
+    fun getFlag(featureKey: String, ctx: VWOContext, listener: IVwoListener) {
+        thread(start = true) {
+            try {
+                val flag = vwoClient?.getFlag(featureKey, ctx)
+                if (flag != null)
+                    listener.onSuccess(flag)
+                else
+                    listener.onFailure("Error getting flag!")
+            } catch (e: Exception) {
+                listener.onFailure(e.message ?: e.toString())
+            }
+        }
     }
 
     /**
diff --git a/fme-android/src/main/java/com/vwo/VWOBuilder.kt b/fme-android/src/main/java/com/vwo/VWOBuilder.kt
index 8b5efe5..c273204 100644
--- a/fme-android/src/main/java/com/vwo/VWOBuilder.kt
+++ b/fme-android/src/main/java/com/vwo/VWOBuilder.kt
@@ -15,7 +15,12 @@
  */
 package com.vwo
 
+import android.app.Application
 import com.fasterxml.jackson.databind.JsonNode
+import com.vwo.utils.AppLifecycleListener
+import com.vwo.packages.storage.MobileDefaultStorage
+import com.vwo.providers.StorageProvider
+import com.vwo.packages.storage.RequestStore
 import com.vwo.models.user.VWOInitOptions
 import com.vwo.packages.logger.enums.LogLevelEnum
 import com.vwo.packages.network_layer.manager.NetworkManager
@@ -25,6 +30,8 @@ import com.vwo.services.LoggerService
 import com.vwo.services.SettingsManager
 import com.vwo.utils.DataTypeUtil
 import com.vwo.utils.LogMessageUtil.buildMessage
+import com.vwo.packages.storage.SettingsStore
+import java.lang.ref.WeakReference
 
 /**
  * Builder class for constructing and configuring VWO instances.
@@ -34,7 +41,7 @@ import com.vwo.utils.LogMessageUtil.buildMessage
  *
  * @param options Optional initialization options for pre-configuring the builder.
  */
-class VWOBuilder(options: VWOInitOptions?) {
+open class VWOBuilder(options: VWOInitOptions?) {
     private var vwoClient: VWOClient? = null
     private val options: VWOInitOptions? = options
     private var settingFileManager: SettingsManager? = null
@@ -149,6 +156,9 @@ class VWOBuilder(options: VWOInitOptions?) {
      */
     fun setStorage(): VWOBuilder {
         if (options?.storage != null) {
+            if(options.storage is MobileDefaultStorage)
+                (options.storage as MobileDefaultStorage).init()
+
             Storage.instance?.attachConnector(options.storage)
         }
         return this
@@ -214,7 +224,7 @@ class VWOBuilder(options: VWOInitOptions?) {
             return this
         }
 
-        if ((options.pollInterval ?:0) < 1000) {
+        if ((options.pollInterval ?: 0) < 1000) {
             LoggerService.log(
                 LogLevelEnum.ERROR,
                 "INIT_OPTIONS_INVALID",
@@ -236,7 +246,7 @@ class VWOBuilder(options: VWOInitOptions?) {
      * Checks and polls for settings updates at the provided interval.
      */
     private fun checkAndPoll() {
-        val pollingInterval: Int = options?.pollInterval?:1000
+        val pollingInterval: Int = options?.pollInterval ?: 1000
 
         while (true) {
             try {
@@ -268,4 +278,45 @@ class VWOBuilder(options: VWOInitOptions?) {
             }
         }
     }
+
+    /**
+     * Sets the shared preferences for the VWO SDK.
+     * This function initializes the settings store and request store using the provided context.
+     * It also saves the migration version to the settings store.
+     *
+     * @return This VWOBuilder instance.
+     */
+    fun setSharePreferences(): VWOBuilder {
+        val context = options?.context ?: return this
+
+        StorageProvider.settingsStore = SettingsStore(context)
+        return this
+    }
+
+    /**
+     * Sets the lifecycle listener for the VWO SDK.
+     *
+     * This function initializes and starts the app lifecycle listener using the provided context.
+     *
+     * @return This VWOBuilder instance.
+     */
+    fun setLifeCycleListener(): VWOBuilder {
+        val context = options?.context ?: return this
+        val appLifecycleListener = AppLifecycleListener()
+        appLifecycleListener.start(context.applicationContext as Application)
+        return this
+    }
+
+    /**
+     * Sets the context for the VWO SDK.
+     *
+     * This function sets the context reference using a WeakReference to avoid memory leaks.
+     *
+     * @return This VWOBuilder instance.
+     */
+    fun setContext(): VWOBuilder {
+        val context = options?.context ?: return this
+        StorageProvider.contextRef = WeakReference(context)
+        return this
+    }
 }
diff --git a/fme-android/src/main/java/com/vwo/VWOClient.kt b/fme-android/src/main/java/com/vwo/VWOClient.kt
index 328fa03..1b3d9e8 100644
--- a/fme-android/src/main/java/com/vwo/VWOClient.kt
+++ b/fme-android/src/main/java/com/vwo/VWOClient.kt
@@ -15,11 +15,13 @@
  */
 package com.vwo
 
+import android.content.Context
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.vwo.api.GetFlagAPI
 import com.vwo.api.SetAttributeAPI
 import com.vwo.api.TrackEventAPI
+import com.vwo.interfaces.IVwoListener
 import com.vwo.models.Settings
 import com.vwo.models.schemas.SettingsSchema
 import com.vwo.models.user.GetFlag
@@ -49,6 +51,7 @@ class VWOClient(settings: String?, options: VWOInitOptions?) {
     private var processedSettings: Settings? = null
     var settings: String? = null
     private var options: VWOInitOptions? = null
+    private var context: Context? = null
 
     init {
         try {
@@ -97,7 +100,7 @@ class VWOClient(settings: String?, options: VWOInitOptions?) {
      */
     fun getFlag(featureKey: String?, context: VWOContext): GetFlag {
         val apiName = "getFlag"
-        val getFlag = GetFlag()
+        val getFlag = GetFlag(context)
         try {
             LoggerService.log(
                 LogLevelEnum.DEBUG,
@@ -109,18 +112,18 @@ class VWOClient(settings: String?, options: VWOInitOptions?) {
                 })
             val hooksManager: HooksManager = HooksManager(options?.integrations)
             if (context.id?.isEmpty() == true) {
-                getFlag.isEnabled=false
+                getFlag.setIsEnabled(false)
                 throw IllegalArgumentException("User ID is required")
             }
 
             if (featureKey.isNullOrEmpty()) {
-                getFlag.isEnabled = false
+                getFlag.setIsEnabled(false)
                 throw IllegalArgumentException("Feature Key is required")
             }
             val procSettings = this.processedSettings
             if (procSettings == null || !SettingsSchema().isSettingsValid(procSettings)) {
                 LoggerService.log(LogLevelEnum.ERROR, "SETTINGS_SCHEMA_INVALID", null)
-                getFlag.isEnabled=false
+                getFlag.setIsEnabled(false)
                 return getFlag
             }
             return GetFlagAPI.getFlag(featureKey, procSettings, context, hooksManager)
@@ -135,7 +138,7 @@ class VWOClient(settings: String?, options: VWOInitOptions?) {
                         put("err", exception.toString())
                     }
                 })
-            getFlag.isEnabled = false
+            getFlag.setIsEnabled(false)
             return getFlag
         }
     }
@@ -238,7 +241,7 @@ class VWOClient(settings: String?, options: VWOInitOptions?) {
      * @return Map containing the event name and its status
      */
     fun trackEvent(eventName: String, context: VWOContext?): Map<String, Boolean> {
-        return track(eventName, context, HashMap<String, Any>())
+        return track(eventName, context, HashMap())
     }
 
 
diff --git a/fme-android/src/main/java/com/vwo/api/GetFlagAPI.kt b/fme-android/src/main/java/com/vwo/api/GetFlagAPI.kt
index 483b183..a33d370 100644
--- a/fme-android/src/main/java/com/vwo/api/GetFlagAPI.kt
+++ b/fme-android/src/main/java/com/vwo/api/GetFlagAPI.kt
@@ -19,6 +19,7 @@ import com.vwo.VWOClient
 import com.vwo.decorators.StorageDecorator
 import com.vwo.enums.ApiEnum
 import com.vwo.enums.CampaignTypeEnum
+import com.vwo.interfaces.IVwoListener
 import com.vwo.models.Campaign
 import com.vwo.models.Feature
 import com.vwo.models.Settings
@@ -52,9 +53,9 @@ object GetFlagAPI {
         featureKey: String,
         settings: Settings,
         context: VWOContext,
-        hookManager: HooksManager
+        hookManager: HooksManager,
     ): GetFlag {
-        val getFlag = GetFlag()
+        val getFlag = GetFlag(context)
         var shouldCheckForExperimentsRules = false
 
         val passedRulesInformation: MutableMap<String, Any> = HashMap()
@@ -84,9 +85,9 @@ object GetFlagAPI {
         try {
             val storageMapAsString: String =
                 VWOClient.objectMapper.writeValueAsString(storedDataMap)
-            val storedData: Storage =
+            val storedData: Storage? =
                 VWOClient.objectMapper.readValue(storageMapAsString, Storage::class.java)
-            if (storedData.experimentVariationId != null && storedData.experimentVariationId.toString().isNotEmpty()) {
+            if (storedData?.experimentVariationId?.toString()?.isNotEmpty() == true) {
 
                 if (storedData.experimentKey != null && storedData.experimentKey!!.isNotEmpty()) {
                     val variation: Variation? = getVariationFromCampaignKey(
@@ -107,12 +108,13 @@ object GetFlagAPI {
                                     put("experimentKey", storedData.experimentKey)
                                 }
                             })
-                        getFlag.isEnabled=true
+                        getFlag.setIsEnabled(true)
                         getFlag.setVariables(variation.variables)
                         return getFlag
+
                     }
                 }
-            } else if (storedData.rolloutKey != null && storedData.rolloutKey!!.isNotEmpty()
+            } else if (storedData?.rolloutKey != null && storedData.rolloutKey!!.isNotEmpty()
                 && storedData.rolloutId != null && storedData.rolloutId.toString().isNotEmpty()) {
 
                 val variation: Variation? = getVariationFromCampaignKey(
@@ -143,12 +145,14 @@ object GetFlagAPI {
                             }
                         })
 
-                    getFlag.isEnabled = true
+                    getFlag.setIsEnabled(true)
                     shouldCheckForExperimentsRules = true
                     val featureInfo = mutableMapOf<String, Any>()
                     storedData.rolloutId?.let { featureInfo["rolloutId"] = it }
                     storedData.rolloutKey?.let { featureInfo["rolloutKey"] = it }
-                    storedData.rolloutVariationId?.let { featureInfo["rolloutVariationId"] = it }
+                    storedData.rolloutVariationId?.let {
+                        featureInfo["rolloutVariationId"] = it
+                    }
                     evaluatedFeatureMap[featureKey] = featureInfo
 
                     passedRulesInformation.putAll(featureInfo)
@@ -170,7 +174,7 @@ object GetFlagAPI {
                         put("featureKey", featureKey)
                     }
                 })
-            getFlag.isEnabled = false
+            getFlag.setIsEnabled(false)
             return getFlag
         }
 
@@ -180,8 +184,9 @@ object GetFlagAPI {
          * get all the rollout rules for the feature and evaluate them
          * if any of the rollout rule passes, break the loop and evaluate the traffic
          */
-        val rollOutRules: List<Campaign> = getSpecificRulesBasedOnType(feature, CampaignTypeEnum.ROLLOUT)
-        if (rollOutRules.isNotEmpty() && !getFlag.isEnabled) {
+        val rollOutRules: List<Campaign> =
+            getSpecificRulesBasedOnType(feature, CampaignTypeEnum.ROLLOUT)
+        if (rollOutRules.isNotEmpty() && !getFlag.isEnabled()) {
             val rolloutRulesToEvaluate: MutableList<Campaign> = ArrayList<Campaign>()
             for (rule in rollOutRules) {
                 val evaluateRuleResult: Map<String, Any> = RuleEvaluationUtil.evaluateRule(
@@ -194,7 +199,8 @@ object GetFlagAPI {
                     storageService,
                     decision
                 )
-                val preSegmentationResult = evaluateRuleResult["preSegmentationResult"] as Boolean
+                val preSegmentationResult =
+                    evaluateRuleResult["preSegmentationResult"] as Boolean
                 // If pre-segmentation passes, add the rule to the list of rules to evaluate
                 if (preSegmentationResult) {
                     rolloutRulesToEvaluate.add(rule)
@@ -202,7 +208,9 @@ object GetFlagAPI {
 
                     rule.id?.let { featureMap["rolloutId"] = it }
                     rule.key?.let { featureMap["rolloutKey"] = it }
-                    rule.variations?.getOrNull(0)?.id?.let { featureMap["rolloutVariationId"] = it }
+                    rule.variations?.getOrNull(0)?.id?.let {
+                        featureMap["rolloutVariationId"] = it
+                    }
 
                     evaluatedFeatureMap[featureKey] = featureMap
                     break
@@ -213,9 +221,13 @@ object GetFlagAPI {
             if (rolloutRulesToEvaluate.isNotEmpty()) {
                 val passedRolloutCampaign: Campaign = rolloutRulesToEvaluate[0]
                 val variation: Variation? =
-                    evaluateTrafficAndGetVariation(settings, passedRolloutCampaign, context.id)
+                    evaluateTrafficAndGetVariation(
+                        settings,
+                        passedRolloutCampaign,
+                        context.id
+                    )
                 if (variation != null) {
-                    getFlag.isEnabled = true
+                    getFlag.setIsEnabled(true)
                     getFlag.setVariables(variation.variables)
                     shouldCheckForExperimentsRules = true
                     updateIntegrationsDecisionObject(
@@ -226,8 +238,8 @@ object GetFlagAPI {
                     )
                     createAndSendImpressionForVariationShown(
                         settings,
-                        passedRolloutCampaign.id?:0,
-                        variation.id?:0,
+                        passedRolloutCampaign.id ?: 0,
+                        variation.id ?: 0,
                         context
                     )
                 }
@@ -248,7 +260,7 @@ object GetFlagAPI {
         if (shouldCheckForExperimentsRules) {
             val experimentRulesToEvaluate: MutableList<Campaign> = ArrayList<Campaign>()
             val experimentRules: List<Campaign> = getAllExperimentRules(feature)
-            val megGroupWinnerCampaigns= mutableMapOf<Int,Int>()
+            val megGroupWinnerCampaigns = mutableMapOf<Int, String>()
 
             for (rule in experimentRules) {
                 // Evaluate the rule here
@@ -262,7 +274,8 @@ object GetFlagAPI {
                     storageService,
                     decision
                 )
-                val preSegmentationResult = evaluateRuleResult["preSegmentationResult"] as Boolean
+                val preSegmentationResult =
+                    evaluateRuleResult["preSegmentationResult"] as Boolean
                 // If pre-segmentation passes, check if the rule has whitelisted variation or not
                 if (preSegmentationResult) {
                     val whitelistedObject: Variation? =
@@ -272,11 +285,13 @@ object GetFlagAPI {
                         experimentRulesToEvaluate.add(rule)
                     } else {
                         // If whitelisted object is not null, update the decision object and send an impression
-                        getFlag.isEnabled = true
+                        getFlag.setIsEnabled(true)
                         getFlag.setVariables(whitelistedObject.variables)
                         rule.id?.let { passedRulesInformation["experimentId"] = it }
                         rule.key?.let { passedRulesInformation["experimentKey"] = it }
-                        whitelistedObject.id?.let { passedRulesInformation["experimentVariationId"] = it }
+                        whitelistedObject.id?.let {
+                            passedRulesInformation["experimentVariationId"] = it
+                        }
                     }
                     break
                 }
@@ -285,9 +300,10 @@ object GetFlagAPI {
             // Evaluate the passed experiment rule traffic and get the variation
             if (experimentRulesToEvaluate.isNotEmpty()) {
                 val campaign: Campaign = experimentRulesToEvaluate[0]
-                val variation: Variation? = evaluateTrafficAndGetVariation(settings, campaign, context.id)
+                val variation: Variation? =
+                    evaluateTrafficAndGetVariation(settings, campaign, context.id)
                 if (variation != null) {
-                    getFlag.isEnabled = true
+                    getFlag.setIsEnabled(true)
                     getFlag.setVariables(variation.variables)
                     updateIntegrationsDecisionObject(
                         campaign,
@@ -297,19 +313,19 @@ object GetFlagAPI {
                     )
                     createAndSendImpressionForVariationShown(
                         settings,
-                        campaign.id?:0,
-                        variation.id?:0,
+                        campaign.id ?: 0,
+                        variation.id ?: 0,
                         context
                     )
                 }
             }
         }
 
-        if (getFlag.isEnabled) {
+        if (getFlag.isEnabled()) {
             val storageMap = mutableMapOf<String, Any>()
 
             feature.key?.let { storageMap["featureKey"] = it }
-            context.id?.let { storageMap["user"] = it }
+            context.id?.let { storageMap["userId"] = it }
             storageMap.putAll(passedRulesInformation)
 
             StorageDecorator().setDataInStorage(storageMap, storageService)
@@ -333,14 +349,14 @@ object GetFlagAPI {
                     init {
                         put("userId", context.id)
                         put("featureKey", featureKey)
-                        put("status", if (getFlag.isEnabled) "enabled" else "disabled")
+                        put("status", if (getFlag.isEnabled()) "enabled" else "disabled")
                     }
                 })
             feature.impactCampaign.campaignId?.let {
                 createAndSendImpressionForVariationShown(
                     settings,
                     it,
-                    if (getFlag.isEnabled) 2 else 1,
+                    if (getFlag.isEnabled()) 2 else 1,
                     context
                 )
             }
@@ -362,13 +378,13 @@ object GetFlagAPI {
         decision: MutableMap<String, Any>
     ) {
         if (campaign.type == CampaignTypeEnum.ROLLOUT.value) {
-            passedRulesInformation["rolloutId"] = campaign.id?:0
-            passedRulesInformation["rolloutKey"] = campaign.name?:""
-            passedRulesInformation["rolloutVariationId"] = variation.id?:0
+            passedRulesInformation["rolloutId"] = campaign.id ?: 0
+            passedRulesInformation["rolloutKey"] = campaign.name ?: ""
+            passedRulesInformation["rolloutVariationId"] = variation.id ?: 0
         } else {
-            passedRulesInformation["experimentId"] = campaign.id?:0
-            passedRulesInformation["experimentKey"] = campaign.key?:""
-            passedRulesInformation["experimentVariationId"] = variation.id?:0
+            passedRulesInformation["experimentId"] = campaign.id ?: 0
+            passedRulesInformation["experimentKey"] = campaign.key ?: ""
+            passedRulesInformation["experimentVariationId"] = variation.id ?: 0
         }
         decision.putAll(passedRulesInformation)
     }
diff --git a/fme-android/src/main/java/com/vwo/api/SetAttributeAPI.kt b/fme-android/src/main/java/com/vwo/api/SetAttributeAPI.kt
index 15770b3..3c8007d 100644
--- a/fme-android/src/main/java/com/vwo/api/SetAttributeAPI.kt
+++ b/fme-android/src/main/java/com/vwo/api/SetAttributeAPI.kt
@@ -66,6 +66,7 @@ object SetAttributeAPI {
         // Construct payload data for tracking the user
         val payload = NetworkUtil.getAttributePayloadData(
             settings,
+            context,
             context.id,
             EventEnum.VWO_SYNC_VISITOR_PROP.value,
             attributeKey,
diff --git a/fme-android/src/main/java/com/vwo/api/TrackEventAPI.kt b/fme-android/src/main/java/com/vwo/api/TrackEventAPI.kt
index 77910e6..73cc90f 100644
--- a/fme-android/src/main/java/com/vwo/api/TrackEventAPI.kt
+++ b/fme-android/src/main/java/com/vwo/api/TrackEventAPI.kt
@@ -75,7 +75,7 @@ object TrackEventAPI {
      * @param context    The user context model containing user-specific data.
      * @param eventProperties event properties for the event
      */
-    private fun createAndSendImpressionForTrack(
+    fun createAndSendImpressionForTrack(
         settings: Settings,
         eventName: String,
         context: VWOContext,
@@ -101,4 +101,4 @@ object TrackEventAPI {
         // Send the constructed properties and payload as a POST request
         NetworkUtil.sendPostApiRequest(properties, payload, context.userAgent, context.ipAddress)
     }
-}
\ No newline at end of file
+}
diff --git a/fme-android/src/main/java/com/vwo/constants/Constants.kt b/fme-android/src/main/java/com/vwo/constants/Constants.kt
index 9aa6142..82ebecd 100644
--- a/fme-android/src/main/java/com/vwo/constants/Constants.kt
+++ b/fme-android/src/main/java/com/vwo/constants/Constants.kt
@@ -28,7 +28,6 @@ object Constants {
     const val DEFAULT_REQUEST_TIME_INTERVAL: Long = 600 // 10 * 60(secs) = 600 secs i.e. 10 minutes
     const val DEFAULT_EVENTS_PER_REQUEST: Int = 100
     const val SDK_NAME: String = "vwo-fme-android-sdk"
-    const val SETTINGS_EXPIRY: Long = 10000000
     const val SETTINGS_TIMEOUT: Long = 50000
 
     const val HOST_NAME: String = "dev.visualwebsiteoptimizer.com"
@@ -36,6 +35,11 @@ object Constants {
 
     const val VWO_FS_ENVIRONMENT: String = "vwo_fs_environment"
     const val HTTPS_PROTOCOL: String = "https"
+    const val VWO_META_MEG_KEY: String = "_vwo_meta_meg_"
+
+    const val VWO_APP_URL: String = "app.vwo.com"
 
     const val RANDOM_ALGO: Int = 1
+
+    const val AUTH_TOKEN = ""
 }
diff --git a/fme-android/src/main/java/com/vwo/decorators/StorageDecorator.kt b/fme-android/src/main/java/com/vwo/decorators/StorageDecorator.kt
index e68bf66..63f2103 100644
--- a/fme-android/src/main/java/com/vwo/decorators/StorageDecorator.kt
+++ b/fme-android/src/main/java/com/vwo/decorators/StorageDecorator.kt
@@ -63,7 +63,7 @@ class StorageDecorator : IStorageDecorator {
         storageService: StorageService
     ): Variation? {
         val featureKey = data["featureKey"] as String?
-        val userId = data["user"]?.toString()
+        val userId = data["userId"]?.toString()
 
         if (featureKey.isNullOrEmpty()) {
             log(LogLevelEnum.ERROR, "STORING_DATA_ERROR", object : HashMap<String?, String?>() {
diff --git a/fme-android/src/main/java/com/vwo/enums/EventEnum.kt b/fme-android/src/main/java/com/vwo/enums/EventEnum.kt
index b0a6583..a839428 100644
--- a/fme-android/src/main/java/com/vwo/enums/EventEnum.kt
+++ b/fme-android/src/main/java/com/vwo/enums/EventEnum.kt
@@ -30,5 +30,7 @@ enum class EventEnum(val value: String) {
     /**
      * Event triggered when a user attribute is set.
      */
-    VWO_SYNC_VISITOR_PROP("vwo_syncVisitorProp")
+    VWO_SYNC_VISITOR_PROP("vwo_syncVisitorProp"),
+
+    VWO_RECOMMENDATION_SHOWN("vwo_recommendation_block_shown");
 }
diff --git a/fme-android/src/main/java/com/vwo/enums/UrlEnum.kt b/fme-android/src/main/java/com/vwo/enums/UrlEnum.kt
index 55bec37..d2aab6f 100644
--- a/fme-android/src/main/java/com/vwo/enums/UrlEnum.kt
+++ b/fme-android/src/main/java/com/vwo/enums/UrlEnum.kt
@@ -33,5 +33,9 @@ enum class UrlEnum(val url: String) {
     /**
      * URL for retrieving user data.
      */
-    GET_USER_DATA("/get-user-details")
+    GET_USER_DATA("/get-user-details"),
+
+    GENERATE_RECOMMENDATION("/internalcall/generate-recommendation"), // TODO -- Change this to actual URL
+
+    EVALUATE_DSL("/evaluate-event-dsl")
 }
diff --git a/fme-android/src/main/java/com/vwo/enums/VariableTypeEnum.kt b/fme-android/src/main/java/com/vwo/enums/VariableTypeEnum.kt
new file mode 100644
index 0000000..0129cf8
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/enums/VariableTypeEnum.kt
@@ -0,0 +1,21 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.enums
+
+enum class VariableTypeEnum(val value: String) {
+    /** Recommendation type*/
+    RECOMMENDATION("recommendation")
+}
diff --git a/fme-android/src/main/java/com/vwo/interfaces/IVwoListener.java b/fme-android/src/main/java/com/vwo/interfaces/IVwoListener.java
new file mode 100644
index 0000000..dd0fde9
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/interfaces/IVwoListener.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.interfaces;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Callback interface to receive notifications about the operation in VWO.
+ */
+public interface IVwoListener {
+    /**
+     * Called when VWO action is successful.
+     * @param data Additional data
+     */
+    void onSuccess(Object data);
+
+    /**
+     * Called when VWO action is failed.
+     * <p>
+     * Most common reason for failure is device unable to connect to Internet.
+     *
+     * @param message String message
+     */
+    void onFailure(@NotNull String message);
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/models/Campaign.kt b/fme-android/src/main/java/com/vwo/models/Campaign.kt
index f86afd0..7e82474 100644
--- a/fme-android/src/main/java/com/vwo/models/Campaign.kt
+++ b/fme-android/src/main/java/com/vwo/models/Campaign.kt
@@ -42,6 +42,11 @@ class Campaign {
     @JsonProperty("segments")
     var segments: Map<String, Any>? = null
 
+    @get:JsonProperty("segments_events")
+    @set:JsonProperty("segments_events")
+    @JsonProperty("segments_events")
+    var segments_events: List<Any>? = null
+
     @JsonProperty("ruleKey")
     var ruleKey: String? = null
 
@@ -94,6 +99,8 @@ class Campaign {
     @JsonProperty("weight")
     var weight: Double = 0.0
 
+    var isEventsDsl: Boolean = false
+
     /**
      * Sets the properties of this campaign from another campaign object.
      *
@@ -153,6 +160,10 @@ class Campaign {
         if (model.endRangeVariation != 0) {
             this.endRangeVariation = model.endRangeVariation
         }
+
+        if (model.segments_events != null) {
+            this.segments_events = model.segments_events
+        }
     }
 }
 
diff --git a/fme-android/src/main/java/com/vwo/models/Groups.kt b/fme-android/src/main/java/com/vwo/models/Groups.kt
index 164e648..0548261 100644
--- a/fme-android/src/main/java/com/vwo/models/Groups.kt
+++ b/fme-android/src/main/java/com/vwo/models/Groups.kt
@@ -18,6 +18,7 @@ package com.vwo.models
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 
+
 /**
  * Represents a group of campaigns in VWO.
  *
@@ -33,7 +34,7 @@ class Groups {
     @get:JsonProperty("campaigns")
     @set:JsonProperty("campaigns")
     @JsonProperty("campaigns")
-    var campaigns: List<Int>? = null
+    var campaigns: List<String>? = null
 
     // this is where algo, priority, weight go
     @JsonProperty("et")
@@ -42,12 +43,12 @@ class Groups {
     @get:JsonProperty("p")
     @set:JsonProperty("p")
     @JsonProperty("p")
-    var p: List<Int>? = null
+    var p: MutableList<String>? = ArrayList()
 
     @get:JsonProperty("wt")
     @set:JsonProperty("wt")
     @JsonProperty("wt")
-    var wt: Map<String, Int>? = null
+    var wt: Map<String, Double>? = mutableMapOf()
 
     /**
      * Sets the experiment type for the group.
diff --git a/fme-android/src/main/java/com/vwo/models/RecommendedProduct.kt b/fme-android/src/main/java/com/vwo/models/RecommendedProduct.kt
new file mode 100644
index 0000000..55967f1
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/models/RecommendedProduct.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.models
+
+
+import com.google.gson.annotations.SerializedName
+import androidx.annotation.Keep
+
+@Keep
+data class RecommendedProduct(
+    @SerializedName("id")
+    val id: String = "",
+)
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/models/Variable.kt b/fme-android/src/main/java/com/vwo/models/Variable.kt
index 6bd2242..1f160dc 100644
--- a/fme-android/src/main/java/com/vwo/models/Variable.kt
+++ b/fme-android/src/main/java/com/vwo/models/Variable.kt
@@ -36,4 +36,7 @@ class Variable {
 
     @JsonProperty("id")
     var id: Int? = null
+
+    @JsonProperty("displayConfiguration")
+    var displayConfiguration: Any? = null
 }
diff --git a/fme-android/src/main/java/com/vwo/models/Variation.kt b/fme-android/src/main/java/com/vwo/models/Variation.kt
index 94036a7..99699cf 100644
--- a/fme-android/src/main/java/com/vwo/models/Variation.kt
+++ b/fme-android/src/main/java/com/vwo/models/Variation.kt
@@ -35,6 +35,12 @@ class Variation {
     @JsonProperty("name")
     var name: String? = null
 
+    @JsonProperty("ruleKey")
+    var ruleKey: String? = null
+
+    @JsonProperty("type")
+    var type: String? = null
+
     @JsonProperty("weight")
     var weight: Double = 0.0
 
@@ -52,4 +58,9 @@ class Variation {
 
     @JsonProperty("segments")
     var segments: Map<String, Any> = HashMap()
+
+    @get:JsonProperty("segments_events")
+    @set:JsonProperty("segments_events")
+    @JsonProperty("segments_events")
+    var segments_events: List<Any>? = null
 }
diff --git a/fme-android/src/main/java/com/vwo/models/user/GetFlag.kt b/fme-android/src/main/java/com/vwo/models/user/GetFlag.kt
index 9fd1775..2e2a346 100644
--- a/fme-android/src/main/java/com/vwo/models/user/GetFlag.kt
+++ b/fme-android/src/main/java/com/vwo/models/user/GetFlag.kt
@@ -15,8 +15,11 @@
  */
 package com.vwo.models.user
 
+import com.vwo.constants.Constants
 import com.vwo.constants.Constants.defaultString
+import com.vwo.enums.VariableTypeEnum
 import com.vwo.models.Variable
+import org.json.JSONObject
 
 /**
  * Represents a feature flag and its associated variables.
@@ -24,10 +27,17 @@ import com.vwo.models.Variable
  * This class encapsulates information about a feature flag, including its enabled status and a
  * list of variables with their values.
  */
-class GetFlag {
-    var isEnabled: Boolean = false
+class GetFlag(val context: VWOContext) {
+    private var isEnabled: Boolean = false
+
     private var variables: List<Variable> = ArrayList<Variable>()
 
+    fun isEnabled() = isEnabled
+
+    fun setIsEnabled(value: Boolean) {
+        isEnabled = value
+    }
+
     /**
      * Sets the variables for the feature flag.
      *
@@ -50,11 +60,30 @@ class GetFlag {
     fun getVariable(key: String?, defaultValue: Any): Any {
         for (variable in variablesValue) {
             if (variable.key.equals(key)) {
+                if (variable.type.equals(VariableTypeEnum.RECOMMENDATION.value,true)) {
+                    // Return a Recommendation Object if type is RECOMMENDATION
+                    val value = variable.value.toString().toIntOrNull()?:0
+                    return Recommendation(value, context)
+                }
+
                 return variable.value?:defaultValue
             }
         }
         return defaultValue
     }
+
+    fun getRecommendationDisplayConfig(key: String?): Map<String, Any>? {
+        for (variable in variablesValue) {
+            if (variable.key.equals(key)) {
+                if (variable.type.equals(VariableTypeEnum.RECOMMENDATION.value, true)) {
+                    // Return a Recommendation Object if type is RECOMMENDATION
+                    return variable.displayConfiguration as? Map<String, Any>
+                }
+            }
+        }
+        return null
+    }
+
     /**
      * Retrieves the list of variables as a list of maps.
      *
@@ -63,7 +92,10 @@ class GetFlag {
     fun getVariables(): List<Map<String, Any>> {
         val result: MutableList<Map<String, Any>> = ArrayList()
         for (variable in variablesValue) {
-            result.add(convertVariableModelToMap(variable))
+            // Check if the variable's type is not "recommendation"
+            if (!variable.type.equals(VariableTypeEnum.RECOMMENDATION.value,true)) {
+                result.add(convertVariableModelToMap(variable))
+            }
         }
         return result
     }
diff --git a/fme-android/src/main/java/com/vwo/models/user/Recommendation.kt b/fme-android/src/main/java/com/vwo/models/user/Recommendation.kt
new file mode 100644
index 0000000..af76bf1
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/models/user/Recommendation.kt
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.models.user
+
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.vwo.api.TrackEventAPI.createAndSendImpressionForTrack
+import com.vwo.enums.EventEnum
+import com.vwo.interfaces.IVwoListener
+import com.vwo.models.RecommendedProduct
+import com.vwo.utils.RecommendationUtil.getRecommendation
+import com.vwo.utils.SettingsUtil
+import org.json.JSONArray
+import org.json.JSONObject
+import kotlin.concurrent.thread
+
+
+class Recommendation(val recommendationBlock: Int, private val context: VWOContext) {
+    /**
+     * This method is used to get recommendations based on the options passed.
+     *
+     * @param options Map<String, Object> containing the options to be passed to the recommendation API
+     * @param listener IVwoListener interface to handle the success and failure of the recommendation API
+     *
+     * @return JSONObject containing the recommendations and the recommendationBlock
+     */
+    fun getRecommendations(options: Map<String, Any>, category:String?, productIds:List<Int>?, listener:IVwoListener) {
+        thread(start = true) {
+            try {
+                val eventType = options["pageType"] as? String ?: ""
+                val recommendations = getRecommendation(
+                    recommendationBlock,
+                    context.id!!,
+                    eventType,
+                    category,
+                    productIds
+                )
+                // Add configId to the recommendations
+                recommendations.put("recommendationBlock", recommendationBlock)
+
+                var results = recommendations.optJSONArray("results")
+                // if recommendations is an empty object or if the results array is empty, then return the recommendations as is
+                if (results == null) {
+                    recommendations.put("results", JSONArray())
+                }
+
+                // Send recommendationShown event
+                results = recommendations.getJSONArray("results")
+                if (results?.length() != 0) {
+                    SettingsUtil.settingsFile?.let {
+
+                        val inputProducts = (options["productIds"] as? String) ?: ""
+                        val data = mapOf<String, Any>(
+                            "recommendation_block" to recommendationBlock.toString(),
+                            "input_products" to inputProducts,
+                            "recommended_products" to getRecommendedProductIds(results),
+                            "page_type" to (options["pageType"] as? String ?: "")
+                        )
+
+                        val eventName = EventEnum.VWO_RECOMMENDATION_SHOWN.value
+                        createAndSendImpressionForTrack(it, eventName, context, data)
+                    }
+                }
+
+                listener.onSuccess(recommendations)
+            } catch (e: Exception) {
+                listener.onFailure(e.message ?: e.toString())
+            }
+            return@thread
+        }
+    }
+
+    private fun getRecommendedProductIds(results: JSONArray?): String {
+        val resultString = results.toString()
+        val listType = object : TypeToken<List<RecommendedProduct>>() {}.type
+        val products:List<RecommendedProduct> = Gson().fromJson(resultString, listType)
+        return products.joinToString(separator = ",") { it.id }
+    }
+
+    fun getRecommendationWidget(featureFlag: GetFlag, overrideVariables:Map<String, Any>, callback:IVwoListener){
+        try {
+            val displayConfig = featureFlag.getRecommendationDisplayConfig("recommendationBlock")
+            if (displayConfig.isNullOrEmpty()) {
+                callback.onFailure("Invalid displayConfig")
+                return
+            }
+            val result = JSONObject(displayConfig)
+            for ((key, value) in overrideVariables) {
+                if (result.has(key)) {
+                    result.put(key, value)
+                }
+            }
+            callback.onSuccess(result)
+        } catch (e:Exception) {
+            callback.onFailure(e.message?:e.toString())
+        }
+    }
+
+    override fun toString(): String {
+        return recommendationBlock.toString()
+    }
+}
diff --git a/fme-android/src/main/java/com/vwo/models/user/VWOContext.kt b/fme-android/src/main/java/com/vwo/models/user/VWOContext.kt
index f369891..71554a1 100644
--- a/fme-android/src/main/java/com/vwo/models/user/VWOContext.kt
+++ b/fme-android/src/main/java/com/vwo/models/user/VWOContext.kt
@@ -25,6 +25,7 @@ class VWOContext {
     var userAgent: String = ""
     var ipAddress: String = ""
     var customVariables: MutableMap<String, Any> = HashMap()
+    var sessionId: Long = 0L
 
     var variationTargetingVariables: MutableMap<String, Any> = HashMap()
 
diff --git a/fme-android/src/main/java/com/vwo/models/user/VWOInitOptions.kt b/fme-android/src/main/java/com/vwo/models/user/VWOInitOptions.kt
index 0ceb7d0..c901e00 100644
--- a/fme-android/src/main/java/com/vwo/models/user/VWOInitOptions.kt
+++ b/fme-android/src/main/java/com/vwo/models/user/VWOInitOptions.kt
@@ -15,11 +15,13 @@
  */
 package com.vwo.models.user
 
+import android.content.Context
 import com.vwo.VWOBuilder
 import com.vwo.interfaces.networking.NetworkClientInterface
 import com.vwo.packages.segmentation_evaluator.evaluators.SegmentEvaluator
 import com.vwo.packages.storage.Connector
 import com.vwo.interfaces.integration.IntegrationCallback
+import com.vwo.packages.storage.MobileDefaultStorage
 
 /**
  * Represents initialization options for the VWO SDK.
@@ -30,15 +32,18 @@ import com.vwo.interfaces.integration.IntegrationCallback
  */
 class VWOInitOptions {
     var sdkKey: String? = null
-    var accountId: Int?=null
+    var accountId: Int? = null
     var integrations: IntegrationCallback? = null
     var logger: Map<String, Any> = HashMap()
     var networkClientInterface: NetworkClientInterface? = null
     var segmentEvaluator: SegmentEvaluator? = null
-    var storage: Connector? = null
+    var storage: Connector = MobileDefaultStorage()
     var pollInterval: Int? = null
 
     var vwoBuilder: VWOBuilder? = null
 
     var gatewayService: Map<String, Any> = HashMap()
+    var context: Context? = null
+    /**If this value is provided, SDK will keep using cached settings till this interval is valid.*/
+    var cachedSettingsExpiryTime: Int = 0
 }
diff --git a/fme-android/src/main/java/com/vwo/packages/network_layer/client/ApiCallRepeater.kt b/fme-android/src/main/java/com/vwo/packages/network_layer/client/ApiCallRepeater.kt
new file mode 100644
index 0000000..b77a73d
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/packages/network_layer/client/ApiCallRepeater.kt
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.packages.network_layer.client
+
+import com.google.gson.Gson
+import com.vwo.providers.StorageProvider
+import com.vwo.packages.logger.enums.LogLevelEnum
+import com.vwo.packages.network_layer.manager.NetworkManager
+import com.vwo.packages.network_layer.models.RequestModel
+import com.vwo.services.LoggerService
+
+/**
+ * An object responsible for repeating failed API calls.
+ *
+ * This object provides a mechanism to retry failed API requests that have been
+ * stored in a request store. It ensures that only one instance of the repeater
+ * is running at a time and allows for execution on a new thread if desired.
+ */
+object ApiCallRepeater {
+
+    /**
+     * A flag indicating whether the repeater is already running.
+     */
+    private var isAlreadyRunning = false
+
+    /**
+     * Starts the API call repeater.
+     *
+     * @param useNewThread A boolean flag indicating whether to execute the repeater
+     * on a new thread. Defaults to `false`.
+     * @return `true` if the repeater was started successfully, `false` otherwise.
+     */
+    fun start(useNewThread: Boolean = false): Boolean {
+
+        if (isAlreadyRunning) return false
+
+        isAlreadyRunning = true
+
+        if (useNewThread)
+            Thread { process() }.start()
+        else
+            process()
+
+        return true
+    }
+
+    /**
+     * Processes the API call repetition.
+     *
+     * This method executes all pending requests and resets the `isAlreadyRunning`
+     * flag to `false` when finished.
+     */
+    private fun process() {
+        executeAllRequests()
+        isAlreadyRunning = false
+    }
+
+    /**
+     * Executes all pending API requests.
+     *
+     * This method retrieves pending requests from the request store, iterates
+     * through them, and attempts to re-execute them. If a request is successful,
+     * it is removed from the store. A delay is introduced between requests to
+     * avoid overwhelming the server.
+     */
+    private fun executeAllRequests() {
+        try {
+            val requests = StorageProvider.requestStore?.getPendingRequests()
+            if (requests.isNullOrEmpty()) return
+
+            for (index in requests.lastIndex downTo 0) {
+                //This loop must be from last to first, to avoid IndexOutOfBounds exception
+                val request = requests[index]
+                val requestModel = Gson().fromJson(request, RequestModel::class.java)
+                val response = NetworkManager.post(requestModel)
+                if (response?.statusCode == 200) {
+                    StorageProvider.requestStore?.removeRequest(index)
+                }
+                Thread.sleep(100)
+            }
+        } catch (e: Exception) {
+            LoggerService.log(LogLevelEnum.DEBUG, e.toString())
+        }
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/packages/network_layer/client/NetworkClient.kt b/fme-android/src/main/java/com/vwo/packages/network_layer/client/NetworkClient.kt
index dafd982..35fc1f4 100644
--- a/fme-android/src/main/java/com/vwo/packages/network_layer/client/NetworkClient.kt
+++ b/fme-android/src/main/java/com/vwo/packages/network_layer/client/NetworkClient.kt
@@ -32,51 +32,56 @@ import java.util.Locale
  * This class provides functionality for sending HTTP requests and receiving responses.
  */
 class NetworkClient : NetworkClientInterface {
+
+    private val maxRetryAttempts = 3
+
     /**
      * Performs a GET request using the provided RequestModel.
      * @param request The model containing request options.
      * @return A ResponseModel with the response data.
      */
     override fun GET(request: RequestModel): ResponseModel {
-        val responseModel = ResponseModel()
-        try {
-            val networkOptions = request.options
-            val url = URL(constructUrl(networkOptions))
+        return retryWrapper {
+            val responseModel = ResponseModel()
+            try {
+                val networkOptions = request.options
+                val url = URL(constructUrl(networkOptions))
 
-            val connection = url.openConnection() as HttpURLConnection
-            connection.requestMethod = "GET"
+                val connection = url.openConnection() as HttpURLConnection
+                connection.requestMethod = "GET"
 
-            //connection.setConnectTimeout(5000);
-            connection.connect()
+                //connection.setConnectTimeout(5000);
+                connection.connect()
 
-            val statusCode = connection.responseCode
-            responseModel.statusCode = statusCode
+                val statusCode = connection.responseCode
+                responseModel.statusCode = statusCode
 
-            val contentType = connection.getHeaderField("Content-Type")
+                val contentType = connection.getHeaderField("Content-Type")
 
-            if (statusCode != 200 || !contentType.contains("application/json")) {
-                val error =
-                    "Invalid response. Status Code: " + statusCode + ", Response : " + connection.responseMessage
-                responseModel.error = Exception(error)
-                return responseModel
-            }
+                if (statusCode != 200 || !contentType.contains("application/json")) {
+                    val error =
+                        "Invalid response. Status Code: " + statusCode + ", Response : " + connection.responseMessage
+                    responseModel.error = Exception(error)
+                    return@retryWrapper responseModel
+                }
 
-            val `in` = BufferedReader(InputStreamReader(connection.inputStream))
-            var inputLine: String?
-            val response = StringBuilder()
+                val `in` = BufferedReader(InputStreamReader(connection.inputStream))
+                var inputLine: String?
+                val response = StringBuilder()
 
-            while ((`in`.readLine().also { inputLine = it }) != null) {
-                response.append(inputLine)
-            }
-            `in`.close()
+                while ((`in`.readLine().also { inputLine = it }) != null) {
+                    response.append(inputLine)
+                }
+                `in`.close()
 
-            val responseData = response.toString()
-            responseModel.data = responseData
+                val responseData = response.toString()
+                responseModel.data = responseData
 
-            return responseModel
-        } catch (exception: Exception) {
-            responseModel.error = exception
-            return responseModel
+                return@retryWrapper responseModel
+            } catch (exception: Exception) {
+                responseModel.error = exception
+                return@retryWrapper responseModel
+            }
         }
     }
 
@@ -86,65 +91,85 @@ class NetworkClient : NetworkClientInterface {
      * @return A ResponseModel with the response data.
      */
     override fun POST(request: RequestModel): ResponseModel {
-        val responseModel = ResponseModel()
-        try {
-            val networkOptions = request.options
-            val url = URL(constructUrl(networkOptions))
-
-            val connection = url.openConnection() as HttpURLConnection
-            connection.requestMethod = "POST"
-            connection.doOutput = true
-            // set headers
-            for ((key, value) in networkOptions) {
-                if (key == "headers") {
-                    val headers = value as Map<String, String>
-                    for ((key1, value1) in headers) {
-                        connection.setRequestProperty(key1, value1)
-                    }
-                }
-            }
+        return retryWrapper {
+            val responseModel = ResponseModel()
+            try {
+                val networkOptions = request.options
+                val url = URL(constructUrl(networkOptions))
+
+                val connection = url.openConnection() as HttpURLConnection
+                connection.requestMethod = "POST"
+                connection.doOutput = true
 
-            connection.outputStream.use { os ->
                 val body = networkOptions["body"]
-                if (body is LinkedHashMap<*, *>) {
-                    // Convert LinkedHashMap to JSON string
+                val bodyArray = if (body is LinkedHashMap<*, *>) {
                     val jsonBody: String = VWOClient.objectMapper.writeValueAsString(body)
-                    val input = jsonBody.toByteArray(StandardCharsets.UTF_8)
-                    os.write(input, 0, input.size)
+                    jsonBody.toByteArray(StandardCharsets.UTF_8)
                 } else if (body is String) {
-                    val input = body.toByteArray(StandardCharsets.UTF_8)
-                    os.write(input, 0, input.size)
+                    body.toByteArray(StandardCharsets.UTF_8)
                 } else {
                     throw IllegalArgumentException("Unsupported body type: " + body?.javaClass?.name)
                 }
-            }
-            val statusCode = connection.responseCode
-            responseModel.statusCode = statusCode
 
-            val `in` = BufferedReader(InputStreamReader(connection.inputStream, "utf-8"))
-            val response = StringBuilder()
-            var inputLine: String?
+                // set headers
+                for ((key, value) in networkOptions) {
+                    if (key == "headers") {
+                        val headers = value as Map<String, String>
+                        for ((key1, value1) in headers) {
+                            connection.setRequestProperty(key1, value1)
+                        }
+                        if (bodyArray.isNotEmpty())
+                            connection.setRequestProperty(
+                                "Content-Length",
+                                bodyArray.size.toString()
+                            )
+                    }
+                }
 
-            while ((`in`.readLine().also { inputLine = it }) != null) {
-                response.append(inputLine)
-            }
-            `in`.close()
+                connection.outputStream.use { os ->
+                    os.write(bodyArray)
+                    os.flush()
+                }
+                val statusCode = connection.responseCode
+                responseModel.statusCode = statusCode
 
-            val responseData = response.toString()
-            responseModel.data = responseData
+                val `in` = BufferedReader(InputStreamReader(connection.inputStream, "utf-8"))
+                val response = StringBuilder()
+                var inputLine: String?
 
-            if (statusCode != 200) {
-                val error = "Request failed. Status Code: $statusCode, Response: $responseData"
-                responseModel.error = Exception(error)
-            }
+                while ((`in`.readLine().also { inputLine = it }) != null) {
+                    response.append(inputLine)
+                }
+                `in`.close()
+
+                val responseData = response.toString()
+                responseModel.data = responseData
 
-            return responseModel
-        } catch (exception: Exception) {
-            responseModel.error = exception
-            return responseModel
+                if (statusCode != 200) {
+                    val error = "Request failed. Status Code: $statusCode, Response: $responseData"
+                    responseModel.error = Exception(error)
+                }
+
+                return@retryWrapper responseModel
+            } catch (exception: Exception) {
+                responseModel.error = exception
+                responseModel.statusCode = 404
+                return@retryWrapper responseModel
+            }
         }
     }
 
+    private fun retryWrapper(requestProcessor: () -> ResponseModel): ResponseModel {
+        var countOfRetries = 0
+        var response: ResponseModel
+        do {
+            response = requestProcessor()
+            countOfRetries++
+        } while (countOfRetries < maxRetryAttempts && response.error != null)
+
+        return response
+    }
+
     companion object {
         /**
          * Constructs a URL from network options.
@@ -154,7 +179,8 @@ class NetworkClient : NetworkClientInterface {
          * @param networkOptions A map containing network options.
          * @return The constructed URL string.
          */
-        fun constructUrl(networkOptions: Map<String, Any?>): String {var hostname = networkOptions["hostname"] as String?
+        fun constructUrl(networkOptions: Map<String, Any?>): String {
+            var hostname = networkOptions["hostname"] as String?
             val path = networkOptions["path"] as String?
             if (networkOptions["port"] != null && networkOptions["port"].toString().toInt() != 0) {
                 hostname += ":" + networkOptions["port"]
diff --git a/fme-android/src/main/java/com/vwo/packages/network_layer/manager/NetworkManager.kt b/fme-android/src/main/java/com/vwo/packages/network_layer/manager/NetworkManager.kt
index a7e93d6..9a7884d 100644
--- a/fme-android/src/main/java/com/vwo/packages/network_layer/manager/NetworkManager.kt
+++ b/fme-android/src/main/java/com/vwo/packages/network_layer/manager/NetworkManager.kt
@@ -15,7 +15,9 @@
  */
 package com.vwo.packages.network_layer.manager
 
+import com.google.gson.Gson
 import com.vwo.interfaces.networking.NetworkClientInterface
+import com.vwo.providers.StorageProvider
 import com.vwo.packages.logger.enums.LogLevelEnum
 import com.vwo.packages.network_layer.client.NetworkClient
 import com.vwo.packages.network_layer.handlers.RequestHandler
@@ -118,7 +120,13 @@ object NetworkManager {
      */
     fun postAsync(request: RequestModel) {
         executorService.submit {
-            post(request)
+            val response = post(request)
+            if (StorageProvider.requestStore == null) return@submit
+
+            if (response == null || response.statusCode != 200) {
+                val requestString = Gson().toJson(request)
+                StorageProvider.requestStore?.addRequest(requestString)
+            }
         }
     }
 }
diff --git a/fme-android/src/main/java/com/vwo/packages/network_layer/models/RequestModel.kt b/fme-android/src/main/java/com/vwo/packages/network_layer/models/RequestModel.kt
index abc00b9..466e29b 100644
--- a/fme-android/src/main/java/com/vwo/packages/network_layer/models/RequestModel.kt
+++ b/fme-android/src/main/java/com/vwo/packages/network_layer/models/RequestModel.kt
@@ -69,9 +69,7 @@ class RequestModel(
             }
 
             if (body != null) {
-                val postBody: String = Gson().toJson(body)
                 headers?.set("Content-Type", "application/json")
-                headers?.set("Content-Length", postBody.toByteArray().size.toString())
                 options["headers"] = headers
                 options["body"] = body
             }
diff --git a/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/core/SegmentationManager.kt b/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/core/SegmentationManager.kt
index 3837273..2d5c6b4 100644
--- a/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/core/SegmentationManager.kt
+++ b/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/core/SegmentationManager.kt
@@ -82,8 +82,11 @@ object SegmentationManager {
 
             try {
                 val params = GatewayServiceUtil.getQueryParams(queryParams)
-                val vwo = GatewayServiceUtil.getFromGatewayService(params, UrlEnum.GET_USER_DATA.url)
-                val gatewayServiceModel = VWOClient.objectMapper.readValue(vwo, GatewayService::class.java)
+                val vwo =
+                    GatewayServiceUtil.getFromGatewayService(params, UrlEnum.GET_USER_DATA.url)
+                val gatewayServiceModel =
+                    VWOClient.objectMapper.readValue(vwo, GatewayService::class.java)
+
                 context.vwo = gatewayServiceModel
             } catch (err: Exception) {
                 LoggerService.log(
@@ -102,10 +105,10 @@ object SegmentationManager {
      */
     fun validateSegmentation(dsl: Any, properties: Map<String, Any>): Boolean {
         try {
-            val dslNodes: JsonNode = if (dsl is String) VWOClient.objectMapper.readValue(
-                dsl.toString(),
-                JsonNode::class.java
-            ) else VWOClient.objectMapper.valueToTree(dsl)
+            val dslNodes: JsonNode = if (dsl is String)
+                VWOClient.objectMapper.readValue(dsl.toString(), JsonNode::class.java)
+            else
+                VWOClient.objectMapper.valueToTree(dsl)
             return evaluator?.isSegmentationValid(dslNodes, properties)?:false
         } catch (exception: Exception) {
             LoggerService.log(
diff --git a/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentEvaluator.kt b/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentEvaluator.kt
index 124f5d8..08118ab 100644
--- a/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentEvaluator.kt
+++ b/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentEvaluator.kt
@@ -291,7 +291,7 @@ class SegmentEvaluator {
         try {
             val storageMapAsString: String =
                 VWOClient.objectMapper.writeValueAsString(storedDataMap)
-            val storedData: Storage =
+            val storedData: Storage? =
                 VWOClient.objectMapper.readValue(storageMapAsString, Storage::class.java)
 
             return storedData != null && (storedDataMap?.size ?: 0) > 1
diff --git a/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentOperandEvaluator.kt b/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentOperandEvaluator.kt
index ffffb3e..9494291 100644
--- a/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentOperandEvaluator.kt
+++ b/fme-android/src/main/java/com/vwo/packages/segmentation_evaluator/evaluators/SegmentOperandEvaluator.kt
@@ -60,7 +60,7 @@ class SegmentOperandEvaluator {
 
         // Handle 'inlist' operand
         if (operandValue.contains("inlist")) {
-            val listIdPattern = Pattern.compile("inlist\\((\\w+:\\d+)\\)")
+            val listIdPattern = Pattern.compile("inlist\\(([^)]+)\\)")
             val matcher = listIdPattern.matcher(operandValue)
             if (!matcher.find()) {
                 LoggerService.log(LogLevelEnum.ERROR, "Invalid 'inList' operand format")
diff --git a/fme-android/src/main/java/com/vwo/packages/storage/DefaultStorage.kt b/fme-android/src/main/java/com/vwo/packages/storage/DefaultStorage.kt
new file mode 100644
index 0000000..2c5738d
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/packages/storage/DefaultStorage.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.packages.storage
+
+import android.content.Context
+
+/**
+ * A default implementation of the `LocalStorageController` interface.
+ * This class provides methods for storing and retrieving data from the device's
+ * local storage using SharedPreferences. It uses a default storage key to store
+ * the data and provides methods for accessing and managing feature keys.
+ */
+internal class DefaultStorage(context: Context) : LocalStorageController(context) {
+
+    /**
+     * The default storage key used to store the data.
+     */
+    private val DEFAULT_STORAGE_STORE_KEY = "Storage"
+
+    /**
+     * Retrieves the feature key from the storage.
+     *
+     * @param featureKey The key used to identify the feature.
+     * @return The feature key if found, or an empty string otherwise.
+     */
+    fun getFeatureKey(featureKey: String): String {
+        return getString(getKey(featureKey))
+    }
+
+    /**
+     * Saves the feature key to the storage.
+     *
+     * @param featureKey The key used to identify the feature.
+     * @param feature The feature value to be stored.
+     */
+    fun saveFeatureKey(featureKey: String, feature: String) {
+        saveString(getKey(featureKey), feature)
+    }
+
+    /**
+     * Clears the feature key from the storage.
+     *
+     * @param featureKey The key used to identify the feature.
+     */
+    fun clearFeatureKey(featureKey: String) {
+        clearData(getKey(featureKey))
+    }
+
+    /**
+     * Generates the storage key for a given feature key.
+     *
+     * @param featureKey The key used to identify the feature.
+     * @return The storage key.
+     */
+    private fun getKey(featureKey: String): String {
+        return DEFAULT_STORAGE_STORE_KEY + featureKey
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/packages/storage/LocalStorageController.kt b/fme-android/src/main/java/com/vwo/packages/storage/LocalStorageController.kt
new file mode 100644
index 0000000..83c8b02
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/packages/storage/LocalStorageController.kt
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.packages.storage
+
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import android.content.SharedPreferences
+
+/**
+ * An abstract class that provides methods for accessing and managing local storage.*
+ * This class uses SharedPreferences to store and retrieve data. It provides methods
+ * for getting and saving strings and longs, as well as clearing data for specific keys.
+ */
+internal open class LocalStorageController(context: Context) {
+
+    /**
+     * The name of the Shared Preferences file.
+     */
+    private val sharedPrefs = "vwo_fme_shared_prefs"
+
+    /**
+     * The SharedPreferences instance.
+     */
+    private val sharedPreferences = context.getSharedPreferences(sharedPrefs, MODE_PRIVATE)
+
+    /**
+     * Retrieves a string value from the storage.
+     *
+     * @param key The key associated with the string value.
+     * @return The string value if found, or an empty string otherwise.
+     */
+    fun getString(key: String): String {
+        return sharedPreferences.getString(key,"") ?: ""
+    }
+
+    /**
+     * Saves a string value to the storage.
+     *
+     * @param key The key associated with the string value.
+     * @param value The string value to be saved.
+     */
+    fun saveString(key: String, value: String) {
+        val editor = sharedPreferences.edit()
+        editor.putString(key, value)
+        editor.apply()
+    }
+
+    /**
+     * Retrieves a long value from the storage.
+     *
+     * @param key The key associated with the long value.
+     * @return The long value if found, or -1 otherwise.
+     */
+    fun getLong(key: String): Long {
+        return sharedPreferences.getLong(key, -1)
+    }
+
+    /**
+     * Saves a long value to the storage.
+     *
+     * @param key The key associated with the long value.
+     * @param value The long value to be saved.
+     */
+    fun saveLong(key: String, value: Long) {
+        val editor = sharedPreferences.edit()
+        editor.putLong(key,value)
+        editor.apply()
+    }
+
+    /**
+     * Clears the data associated with a specific key.
+     *
+     * @param key The key associated with the data to be cleared.
+     */
+    fun clearData(key: String) {
+        val editor: SharedPreferences.Editor = sharedPreferences.edit()
+        editor.remove(key)
+        editor.apply()
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/packages/storage/MobileDefaultStorage.kt b/fme-android/src/main/java/com/vwo/packages/storage/MobileDefaultStorage.kt
new file mode 100644
index 0000000..7641fbb
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/packages/storage/MobileDefaultStorage.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package com.vwo.packages.storage
+
+import com.vwo.providers.StorageProvider.contextRef
+import com.vwo.utils.toMap
+import org.json.JSONObject
+
+/**
+ * A class that provides a default implementation for storing and retrieving data* using the device's local storage.
+ *
+ * This class implements the `Connector` interface and uses a `DefaultStorage`
+ * instance to interact with the local storage. It provides methods for setting
+ * and getting data associated with feature keys and user IDs.
+ */
+class MobileDefaultStorage :Connector() {
+
+    /**
+     * The instance of `DefaultStorage` used for local storage operations.
+     */
+    private var storage: DefaultStorage? = null
+
+    /**
+     * Initializes the `MobileDefaultStorage` instance.
+     *
+     * This method retrieves the application context and initializes the
+     * `storage` instance using the context.
+     */
+    fun init() {
+        val context = contextRef.get()
+        context?.let { storage = DefaultStorage(context) }
+    }
+
+    /**
+     * Stores data associated with a feature key and userID.
+     *
+     * @param data A map containing the data to be stored. The map should
+     * contain the following keys:
+     * - "featureKey": The feature key for the data.
+     * - "user": The user ID for the data.
+     * - "rolloutKey": The rollout key for the data (optional).
+     * - "rolloutVariationId": The rollout variation ID for the data (optional).
+     * - "experimentKey": The experiment key for the data (optional).
+     * - "experimentVariationId": The experiment variation ID for the data (optional).
+     * - "rolloutId": The rollout ID for the data (optional).
+     * - "experimentId": The experiment ID for the data (optional).
+     */
+    override fun set(data: Map<String, Any>) {
+        if (storage == null) return
+
+        val key = data["featureKey"].toString() + "_" + data["userId"]
+
+        // Create a map to store the data
+        val value: MutableMap<String, Any?> = HashMap()
+        data["rolloutKey"]?.let { value["rolloutKey"] = it }
+        data["rolloutVariationId"]?.let { value["rolloutVariationId"] = it }
+        data["experimentKey"]?.let { value["experimentKey"] = it }
+        data["experimentVariationId"]?.let { value["experimentVariationId"] = it }
+
+        data["rolloutId"]?.let { value["rolloutId"] = it }
+        data["experimentId"]?.let { value["experimentId"] = it }
+
+        val jsonValue = JSONObject(value)
+        // Store the value in the storage
+        storage?.saveFeatureKey(key, jsonValue.toString())
+    }
+
+    /**
+     * Retrieves data associated with a feature key and user ID.
+     *
+     * @param featureKey The feature key for the data.
+     * @param userId The user ID for the data.
+     * @return The data if found, or null otherwise.
+     */
+    override fun get(featureKey: String?, userId: String?): Any? {
+        val key = featureKey + "_" + userId
+
+        val stringValue = storage?.getFeatureKey(key)
+        // Check if the key exists in the storage
+        if (stringValue.isNullOrEmpty()) {
+            return null
+        }
+        return JSONObject(stringValue).toMap()
+    }
+}
diff --git a/fme-android/src/main/java/com/vwo/packages/storage/RequestStore.kt b/fme-android/src/main/java/com/vwo/packages/storage/RequestStore.kt
new file mode 100644
index 0000000..534baac
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/packages/storage/RequestStore.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.packages.storage
+
+import android.content.Context
+import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
+import com.google.gson.reflect.TypeToken
+import com.vwo.packages.logger.enums.LogLevelEnum
+import com.vwo.services.LoggerService.Companion.log
+
+/**
+ * A class for managing pending API requests.
+ *
+ * This class uses local storage to persist pending requests and provides methods
+ * for adding, retrieving, removing, and clearing requests. It utilizes Gson
+ * for JSON serialization and deserialization.
+ */
+internal class RequestStore(context: Context) : LocalStorageController(context) {
+
+    /**
+     * The key used to store pending requests in local storage.
+     */
+    private val KEY = "PendingRequests"
+
+    /**
+     * A mutable list to store pending requests.
+     */
+    private val pendingRequests = mutableListOf<String>()
+
+    /**
+     * Retrieves the list of pending requests.
+     *
+     * This method retrieves pending requests from local storage and populates
+     * the `pendingRequests` list. If the list is already populated, it is
+     * returned directly. If there are no pending requests in local storage,
+     * an empty list is returned.
+     * @return The list of pending requests.
+     */
+    fun getPendingRequests(): List<String> {
+        if (pendingRequests.isNotEmpty()) return pendingRequests
+
+        val stringArray = getString(KEY)
+        if (stringArray.isEmpty()) return pendingRequests
+        try {
+            val myType = object : TypeToken<List<String>>() {}.type
+            val requests = Gson().fromJson<List<String>>(stringArray, myType)
+            pendingRequests.addAll(requests)
+        } catch (e: JsonSyntaxException) {
+            val map = mutableMapOf<String?, String?>()
+            map["err"] = e.message
+            log(LogLevelEnum.ERROR, "PARSING_ERROR", map)
+        }
+        return pendingRequests
+    }
+
+    /**
+     * Adds a request to the list of pending requests.
+     *
+     * @param request The request to be added.
+     */
+    fun addRequest(request: String) {
+        pendingRequests.add(request)
+        saveAllRequests()
+    }
+
+    /**
+     * Saves all pending requests to local storage.
+     *
+     * This method serializes the `pendingRequests`list to JSON using Gson
+     * and saves it to local storage using the `KEY`.
+     */
+    private fun saveAllRequests() {
+        saveString(key = KEY, Gson().toJson(pendingRequests))
+    }
+
+    /**
+     * Clears all pending requests from local storage.
+     */
+    fun clearSettings() {
+        clearData(KEY)
+    }
+
+    /**
+     * Removes a request from the list of pending requests.
+     *
+     * @param index The index of the request to be removed.
+     */
+    fun removeRequest(index: Int) {
+        pendingRequests.removeAt(index)
+        saveAllRequests()
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/packages/storage/SettingsStore.kt b/fme-android/src/main/java/com/vwo/packages/storage/SettingsStore.kt
new file mode 100644
index 0000000..3dc81e2
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/packages/storage/SettingsStore.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.packages.storage
+
+import android.content.Context
+
+/**
+ * A class for managing the storage and retrieval of settings data.*
+ * This class uses local storage to persist settings data and provides methods
+ * for getting, saving, and clearing settings. It also manages the expiry time
+ * of the settings data.
+ */
+internal class SettingsStore(context: Context) : LocalStorageController(context) {
+
+    /*** The key used to store the settings data in local storage.
+     */
+    private val SETTINGS_KEY = "settings"
+
+    /**
+     * The key used to store the settings expiry time in local storage.
+     */
+    private val SETTINGS_EXPIRY_KEY = "settingsExpiry"
+
+    /**
+     * Retrieves the settings data from local storage.
+     *
+     * @return The settings data as a string.
+     */
+    fun getSettings(): String {
+        return getString(SETTINGS_KEY)
+    }
+
+    /**
+     * Saves the settings data to local storage.
+     *
+     * @param settings The settings data to be saved.
+     */
+    fun saveSettings(settings: String) {
+        saveString(SETTINGS_KEY, settings)
+    }
+
+    /**
+     * Clears the settings data from local storage.
+     */
+    fun clearSettings() {
+        clearData(SETTINGS_KEY)
+    }
+
+    /**
+     * Retrieves the settings expiry time from local storage.
+     *
+     * @return The settings expiry time as a long value.
+     */
+    fun getSettingsExpiry(): Long {
+        return getLong(SETTINGS_EXPIRY_KEY)
+    }
+
+    /**
+     * Saves the settings expiry time to local storage.
+     *
+     * @param expiryTime The settings expiry time to be saved.
+     */
+    fun saveSettingsExpiry(expiryTime: Long) {
+        saveLong(SETTINGS_EXPIRY_KEY, expiryTime)
+    }
+
+    /**
+     * Clears the settings expiry time from local storage.
+     */
+    fun clearSettingsExpiry() {
+        clearData(SETTINGS_EXPIRY_KEY)
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/providers/StorageProvider.kt b/fme-android/src/main/java/com/vwo/providers/StorageProvider.kt
new file mode 100644
index 0000000..d3c60ee
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/providers/StorageProvider.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.providers
+
+import android.content.Context
+import com.vwo.packages.storage.RequestStore
+import com.vwo.packages.storage.SettingsStore
+import java.lang.ref.WeakReference
+
+/**
+ * An object that provides access to various components and data stores.
+ * This object acts as a central point for accessing instances of `SettingsStore`,
+ * `RequestStore`, and the application context. It uses weak references to avoid
+ * memory leaks.
+ */
+internal object StorageProvider {
+
+    /**
+     * The instance of `SettingsStore` used to manage settingsdata.
+     */
+    var settingsStore: SettingsStore? = null
+
+    /**
+     * The instance of `RequestStore` used to manage API requests.
+     */
+    var requestStore: RequestStore? = null
+
+    /**
+     * A weak reference to the application context.
+     */
+    var contextRef: WeakReference<Context> = WeakReference(null)
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/services/CampaignDecisionService.kt b/fme-android/src/main/java/com/vwo/services/CampaignDecisionService.kt
index 3236ffc..d845863 100644
--- a/fme-android/src/main/java/com/vwo/services/CampaignDecisionService.kt
+++ b/fme-android/src/main/java/com/vwo/services/CampaignDecisionService.kt
@@ -23,6 +23,8 @@ import com.vwo.models.user.VWOContext
 import com.vwo.packages.decision_maker.DecisionMaker
 import com.vwo.packages.logger.enums.LogLevelEnum
 import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import com.vwo.utils.EventsUtils
+
 
 /**
  * Provides decision-making logic for campaigns.
@@ -62,8 +64,13 @@ class CampaignDecisionService {
             object : HashMap<String?, String?>() {
                 init {
                     put("userId", userId)
-                    put("campaignKey", campaign.ruleKey)
                     put("notPart", if (isUserPart) "" else "not")
+                    put("campaignKey",
+                        if (campaign.type.equals(CampaignTypeEnum.AB.value))
+                            campaign.key
+                        else
+                            campaign.name + "_" + campaign.ruleKey
+                    )
                 }
             })
         return isUserPart
@@ -141,37 +148,57 @@ class CampaignDecisionService {
     fun getPreSegmentationDecision(campaign: Campaign, context: VWOContext): Boolean {
         val campaignType = campaign.type
 
-        val segments =
+        val segmentsEvents =
             if (campaignType == CampaignTypeEnum.ROLLOUT.value || campaignType == CampaignTypeEnum.PERSONALIZE.value) {
+                campaign.variations!![0].segments_events
+            } else if (campaignType == CampaignTypeEnum.AB.value) {
+                campaign.segments_events
+            } else {
+                emptyList()
+            }
+        var segments: Map<String, Any>? = emptyMap()
+        if (!segmentsEvents.isNullOrEmpty()) {
+            segments = mapOf("cnds" to segmentsEvents)
+        } else {
+            segments = if (campaignType == CampaignTypeEnum.ROLLOUT.value || campaignType == CampaignTypeEnum.PERSONALIZE.value) {
                 campaign.variations!![0].segments
             } else if (campaignType == CampaignTypeEnum.AB.value) {
-                campaign.segments
+                campaign.segments ?: emptyMap()
             } else {
                 emptyMap()
             }
-
-        if (segments!!.isEmpty()) {
+        }
+        if (segments.isEmpty()) {
             LoggerService.log(
                 LogLevelEnum.INFO,
                 "SEGMENTATION_SKIP",
                 object : HashMap<String?, String?>() {
                     init {
                         put("userId", context.id)
-                        put("campaignKey", campaign.ruleKey)
+                        put("campaignKey",
+                            if (campaign.type.equals(CampaignTypeEnum.AB.value))
+                                campaign.key
+                            else
+                                campaign.name + "_" + campaign.ruleKey
+                        )
                     }
                 })
             return true
         } else {
-            val preSegmentationResult = SegmentationManager.validateSegmentation(
-                segments, context.customVariables
-            )
+
+            val preSegmentationResult = getPreSegmentationResult(campaign, context, segments)
             LoggerService.log(
                 LogLevelEnum.INFO,
                 "SEGMENTATION_STATUS",
                 object : HashMap<String?, String?>() {
                     init {
                         put("userId", context.id)
-                        put("campaignKey", campaign.ruleKey)
+                        put("campaignKey",
+                            if (campaign.type.equals(CampaignTypeEnum.AB.value))
+                                campaign.key
+                            else
+                                campaign.name + "_" + campaign.ruleKey
+                        )
                         put("status", if (preSegmentationResult) "passed" else "failed")
                     }
                 })
@@ -179,6 +206,21 @@ class CampaignDecisionService {
         }
     }
 
+    private fun getPreSegmentationResult(
+        campaign: Campaign,
+        context: VWOContext,
+        segments: Map<String, Any>
+    ): Boolean {
+        val preSegmentationResult = if (campaign.isEventsDsl) {
+            EventsUtils().getEventsPreSegmentation(segments, context)
+        } else {
+            SegmentationManager.validateSegmentation(
+                segments, context.customVariables
+            )
+        }
+        return preSegmentationResult
+    }
+
     /**
      * This method is used to get the variation allotted to the user in the campaign.
      * @param userId  User ID for which the variation is to be allotted.
diff --git a/fme-android/src/main/java/com/vwo/services/SettingsManager.kt b/fme-android/src/main/java/com/vwo/services/SettingsManager.kt
index 7875227..7c6861b 100644
--- a/fme-android/src/main/java/com/vwo/services/SettingsManager.kt
+++ b/fme-android/src/main/java/com/vwo/services/SettingsManager.kt
@@ -17,6 +17,7 @@ package com.vwo.services
 
 import com.vwo.VWOClient
 import com.vwo.constants.Constants
+import com.vwo.providers.StorageProvider
 import com.vwo.models.Settings
 import com.vwo.models.schemas.SettingsSchema
 import com.vwo.models.user.VWOInitOptions
@@ -35,10 +36,9 @@ import java.net.URL
  */
 class SettingsManager(options: VWOInitOptions) {
     private val sdkKey = options.sdkKey
-    private val accountId = options.accountId
+    val accountId = options.accountId
 
-    // TODO -- check expiry logic
-    private val expiry = Constants.SETTINGS_EXPIRY.toInt()
+    private val cachedSettingsExpiryInterval = options.cachedSettingsExpiryTime
     private val networkTimeout = Constants.SETTINGS_TIMEOUT.toInt()
     var hostname: String
 
@@ -46,11 +46,11 @@ class SettingsManager(options: VWOInitOptions) {
     var port: Int = 0
 
     @JvmField
-    var protocol: String = "https"
+    var protocol: String = Constants.HTTPS_PROTOCOL
     var isGatewayServiceProvided: Boolean = false
 
     init {
-        if (options.gatewayService != null && !options.gatewayService.isEmpty()) {
+        if (options.gatewayService.isNotEmpty()) {
             isGatewayServiceProvided = true
             try {
                 val parsedUrl: URL
@@ -60,8 +60,8 @@ class SettingsManager(options: VWOInitOptions) {
                 parsedUrl =
                     if (gatewayServiceUrl.startsWith("http://") || gatewayServiceUrl.startsWith("https://")) {
                         URL(gatewayServiceUrl)
-                    } else if (gatewayServiceProtocol != null && !gatewayServiceProtocol.toString()
-                            .isEmpty()
+                    } else if (gatewayServiceProtocol != null
+                        && gatewayServiceProtocol.toString().isNotEmpty()
                     ) {
                         URL("$gatewayServiceProtocol://$gatewayServiceUrl")
                     } else {
@@ -90,22 +90,62 @@ class SettingsManager(options: VWOInitOptions) {
     /**
      * Fetches settings from the server
      */
-    private fun fetchSettingsAndCacheInStorage(): String? {
+    private fun fetchFromCacheOrServer(): String? {
         try {
-            return fetchSettings()
+            var responseString: String?
+
+            if (canUseCachedSettings()) {
+                responseString = getCachedSetting()
+                if (responseString.isNullOrEmpty()) {
+                    responseString = fetchAndCacheServerSettings()
+                }
+            } else {
+                responseString = fetchSettings()
+                if (!responseString.isNullOrEmpty()) {
+                    updateSettingsCache(responseString)
+                } else if (cachedSettingsAllowed()) {
+                    //Return settings even if it is expired - SDK should work as long as there is setting in cache.
+                    responseString = getCachedSetting()
+                }
+            }
+            return responseString
         } catch (e: Exception) {
-            LoggerService.log(
-                LogLevelEnum.ERROR,
-                "SETTINGS_FETCH_ERROR",
-                object : HashMap<String?, String?>() {
-                    init {
-                        put("err", e.toString())
-                    }
-                })
+            val map = mapOf<String?, String?>("err" to e.toString())
+            LoggerService.log(LogLevelEnum.ERROR, "SETTINGS_FETCH_ERROR", map)
         }
         return null
     }
 
+    private fun cachedSettingsAllowed() = cachedSettingsExpiryInterval != 0
+
+    private fun fetchAndCacheServerSettings(): String? {
+        val response: String? = fetchSettings()
+        if (response != null) {
+            updateSettingsCache(response)
+        }
+        return response
+    }
+
+    private fun updateSettingsCache(responseString: String) {
+        StorageProvider.settingsStore?.saveSettings(responseString)
+        val expiryTime = System.currentTimeMillis() + cachedSettingsExpiryInterval
+        StorageProvider.settingsStore?.saveSettingsExpiry(expiryTime)
+    }
+
+    private fun getCachedSetting(): String? {
+        return StorageProvider.settingsStore?.getSettings()
+    }
+
+    private fun canUseCachedSettings(): Boolean {
+        if (cachedSettingsExpiryInterval == 0) return false
+        return isCachedSettingValid()
+    }
+
+    private fun isCachedSettingValid(): Boolean {
+        val expiryTime = StorageProvider.settingsStore?.getSettingsExpiry() ?: -1
+        return expiryTime != -1L && System.currentTimeMillis() <= expiryTime
+    }
+
     /**
      * Fetches settings from the server
      * @return settings
@@ -135,7 +175,7 @@ class SettingsManager(options: VWOInitOptions) {
 
             val response = NetworkManager.get(request)
             if (response?.statusCode != 200) {
-                LoggerService.Companion.log(
+                LoggerService.log(
                     LogLevelEnum.ERROR,
                     "SETTINGS_FETCH_ERROR",
                     object : HashMap<String?, String?>() {
@@ -164,19 +204,17 @@ class SettingsManager(options: VWOInitOptions) {
      */
     fun getSettings(forceFetch: Boolean): String? {
         if (forceFetch) {
-            return fetchSettingsAndCacheInStorage()
+            LoggerService.log(LogLevelEnum.INFO, "Settings: Fetched from: ServerPoll")
+            return fetchAndCacheServerSettings()
         } else {
             try {
-                val settings = fetchSettingsAndCacheInStorage()
+                val settings = fetchFromCacheOrServer()
                 if (settings == null) {
                     LoggerService.log(LogLevelEnum.ERROR, "SETTINGS_SCHEMA_INVALID", null)
                     return null
                 }
                 val settingsValid = SettingsSchema().isSettingsValid(
-                    VWOClient.objectMapper.readValue(
-                        settings,
-                        Settings::class.java
-                    )
+                    VWOClient.objectMapper.readValue(settings, Settings::class.java)
                 )
                 if (settingsValid) {
                     return settings
diff --git a/fme-android/src/main/java/com/vwo/services/StorageService.kt b/fme-android/src/main/java/com/vwo/services/StorageService.kt
index 957c60c..31c8743 100644
--- a/fme-android/src/main/java/com/vwo/services/StorageService.kt
+++ b/fme-android/src/main/java/com/vwo/services/StorageService.kt
@@ -37,7 +37,7 @@ class StorageService {
     fun getDataInStorage(featureKey: String?, context: VWOContext): Map<String, Any>? {
         val storageInstance = Storage.instance?.getConnector() ?: return null
         try {
-            return (storageInstance as Connector).get(featureKey, context.id) as Map<String, Any>
+            return (storageInstance as Connector).get(featureKey, context.id) as? Map<String, Any>
         } catch (e: Exception) {
             LoggerService.log(
                 LogLevelEnum.ERROR,
diff --git a/fme-android/src/main/java/com/vwo/utils/AppLifecycleListener.kt b/fme-android/src/main/java/com/vwo/utils/AppLifecycleListener.kt
new file mode 100644
index 0000000..e0d9cc1
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/utils/AppLifecycleListener.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.utils
+
+import android.app.Activity
+import android.app.Application
+import android.os.Bundle
+import com.vwo.packages.logger.enums.LogLevelEnum
+import com.vwo.packages.network_layer.client.ApiCallRepeater
+import com.vwo.services.LoggerService
+
+/**
+ * A class that listens to the application's activity lifecycle events.*
+ * This class implements the `Application.ActivityLifecycleCallbacks` interface
+ * and provides methods to start and stop listening to activity lifecycle events.
+ * It also keeps track of the number of active activities and triggers actions
+ * based on the activity lifecycle state.
+ */
+class AppLifecycleListener : Application.ActivityLifecycleCallbacks {
+
+    /**
+     * The number of active activities.
+     */
+    private var activityCounter = 0
+
+    /**
+     * Starts listening to activity lifecycle events.
+     *
+     * @param application The application instance to register the lifecycle callbacks with.
+     */
+    fun start(application: Application) {
+        application.registerActivityLifecycleCallbacks(this)
+    }
+
+    /**
+     * Stops listening to activity lifecycle events.
+     *
+     * @param application The application instance to unregister the lifecycle callbacks from.
+     */
+    fun stop(application: Application) {
+        application.unregisterActivityLifecycleCallbacks(this)
+    }
+
+    /**
+     * Called when an activity is created.
+     *
+     * @param activity The activity that was created.
+     * @param savedInstanceState If the activity is being re-created after
+     * previously being destroyed, then this Bundle contains the data it most
+     * recently supplied in [onSaveInstanceState].
+     * **Note: Otherwise it is null.**
+     */
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+    }
+
+    /**
+     * Called when an activity is started.
+     *
+     * @param activity The activity that was started.
+     */
+    override fun onActivityStarted(activity: Activity) {
+        activityCounter++
+        LoggerService.log(LogLevelEnum.INFO, "APP_LIFECYCLE_EVENT $activityCounter")
+    }
+
+    /**
+     * Called when an activity is resumed.
+     *
+     * @param activity The activity that was resumed.
+     */
+    override fun onActivityResumed(activity: Activity) {
+    }
+
+    /**
+     * Called whenan activity is paused.
+     *
+     * @param activity The activity that was paused.
+     */
+    override fun onActivityPaused(activity: Activity) {
+    }
+
+    /**
+     * Called when an activity is stopped. This is used to trigger the API call repeater when app
+     * is finished off all activities.
+     *
+     * @param activity The activity that was stopped.
+     */
+    override fun onActivityStopped(activity: Activity) {
+        activityCounter--
+        if (activityCounter <= 0) {
+            ApiCallRepeater.start()
+        }
+        LoggerService.log(LogLevelEnum.INFO, "APP_LIFECYCLE_EVENT $activityCounter")
+    }
+
+    /**
+     * Called to retrieve per-instance state from an activity before being killed
+     * so that the state can be restored in [onActivityCreated] or
+     * [onRestoreInstanceState] (the [Bundle] populated by this method
+     * will be passed to both).
+     *
+     * @param activity The activity that was stopped.
+     * @param outState Bundle in which to place your saved state.
+     */
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+    }
+
+    /**
+     * Called when an activity is destroyed.
+     *
+     * @param activity The activity that was destroyed.
+     */
+    override fun onActivityDestroyed(activity: Activity) {
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/utils/CampaignUtil.kt b/fme-android/src/main/java/com/vwo/utils/CampaignUtil.kt
index ccb6021..5b7f76c 100644
--- a/fme-android/src/main/java/com/vwo/utils/CampaignUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/CampaignUtil.kt
@@ -28,6 +28,7 @@ import java.util.function.Consumer
 import kotlin.math.ceil
 import kotlin.math.min
 
+
 /**
  * Utility class for campaign operations.
  *
@@ -166,15 +167,23 @@ object CampaignUtil {
      */
     fun getGroupDetailsIfCampaignPartOfIt(
         settings: Settings,
-        campaignId: Int
-    ): Map<String?, String?> {
-        // Check if the campaign is associated with a group and return the group details
-        val groupDetails: MutableMap<String?, String?> = HashMap()
-        if (settings.campaignGroups != null && settings.campaignGroups!!.containsKey(campaignId.toString())) {
-            val groupId = settings.campaignGroups!![campaignId.toString()]!!
-            val groupName = settings.groups!![groupId.toString()]!!.name
+        campaignId: Int,
+        variationId: Int
+    ): MutableMap<String, String> {
+        // If variationId is null, that means that campaign is testing campaign
+        // If variationId is not null, that means that campaign is personalization campaign and we need to append variationId to campaignId using _
+        // then check if the current campaign is part of any group
+        val groupDetails: MutableMap<String, String> = HashMap()
+        var campaignToCheck = campaignId.toString()
+        if (variationId != -1) {
+            campaignToCheck = campaignToCheck + "_" + variationId
+        }
+        val campaignGroups = settings.campaignGroups
+        if (campaignGroups!= null && campaignGroups.containsKey(campaignToCheck)) {
+            val groupId = campaignGroups[campaignToCheck]
+            val groupName = settings.groups?.get(groupId.toString())?.name
             groupDetails["groupId"] = groupId.toString()
-            groupDetails["groupName"] = groupName
+            groupDetails["groupName"] = groupName?:""
             return groupDetails
         }
         return groupDetails
@@ -188,27 +197,36 @@ object CampaignUtil {
      */
     fun findGroupsFeaturePartOf(
         settings: Settings,
-        featureKey: String
-    ): List<Map<String?, String?>> {
-        val campaignIds: MutableList<Int> = ArrayList()
-        // Loop over all rules inside the feature where the feature key matches and collect all campaign IDs
-        for (feature in settings.features!!) {
-            if (feature.key == featureKey) {
-                feature.rules!!.forEach(Consumer { rule: Rule ->
-                    if (!campaignIds.contains(rule.campaignId)) {
-                        campaignIds.add(rule.campaignId!!)
+        featureKey: String?
+    ): MutableList<MutableMap<String, String>> {
+        // Initialize an array to store all rules for the given feature to fetch campaignId and variationId later
+        val ruleArrayList: MutableList<Rule> = ArrayList()
+        for (feature in settings.features) {
+            if (feature.key.equals(featureKey)) {
+                feature.rules?.forEach { rule ->
+                    // Add rule to the array if it's not already present
+                    if (!ruleArrayList.contains(rule)) {
+                        ruleArrayList.add(rule)
                     }
-                })
+                }
             }
         }
 
-        // Loop over all campaigns and find the group for each campaign
-        val groups: MutableList<Map<String?, String?>> = ArrayList()
-        for (campaignId in campaignIds) {
-            val group = getGroupDetailsIfCampaignPartOfIt(settings, campaignId)
-            if (!group.isEmpty() && groups.stream()
-                    .noneMatch { g: Map<String?, String?> -> g["groupId"] == group["groupId"] }
-            ) {
+        // Initialize an array to store all groups associated with the feature
+        val groups: MutableList<MutableMap<String, String>> = ArrayList()
+        // Iterate over each rule to find the group details
+        for (rule in ruleArrayList) {
+            val variationId = if (rule.type == CampaignTypeEnum.PERSONALIZE.value)
+                rule.variationId?:-1
+            else
+                -1
+            val group: MutableMap<String, String> = getGroupDetailsIfCampaignPartOfIt(
+                settings,
+                rule.campaignId!!,
+                variationId
+            )
+            // Add group to the array if it's not already present
+            if (group.isNotEmpty() && groups.none { it["groupId"] == group["groupId"] }) {
                 groups.add(group)
             }
         }
@@ -221,7 +239,7 @@ object CampaignUtil {
      * @param groupId The ID of the group.
      * @return An array of campaigns associated with the specified group ID.
      */
-    fun getCampaignsByGroupId(settings: Settings, groupId: Int): List<Int> {
+    fun getCampaignsByGroupId(settings: Settings, groupId: Int): List<String> {
         // find the group
         val group = settings.groups?.get(groupId.toString())
         return group?.campaigns?: emptyList()
@@ -230,16 +248,39 @@ object CampaignUtil {
     /**
      * Retrieves feature keys from a list of campaign IDs.
      * @param settings The settings model containing all features.
-     * @param campaignIds An array of campaign IDs.
+     * @param campaignIdWithVariation An array of campaign IDs.
      * @return An array of feature keys associated with the provided campaign IDs.
      */
-    fun getFeatureKeysFromCampaignIds(settings: Settings, campaignIds: List<Int>): List<String> {
+    fun getFeatureKeysFromCampaignIds(
+        settings: Settings,
+        campaignIdWithVariation: List<String>
+    ): MutableList<String> {
         val featureKeys: MutableList<String> = ArrayList()
-        for (campaignId in campaignIds) {
+        for (campaign in campaignIdWithVariation) {
+            // split key with _ to separate campaignId and variationId
+            val campaignIdVariationId = campaign.split("_".toRegex()).dropLastWhile { it.isEmpty() }
+                .toTypedArray()
+            val campaignId = campaignIdVariationId[0].toInt()
+            val variationId =
+                if ((campaignIdVariationId.size > 1)) campaignIdVariationId[1].toInt() else null
+            // Iterate over each feature to find the feature key
             for (feature in settings.features) {
-                feature.rules?.forEach { rule: Rule ->
+                // Break if feature key is already added
+                if (featureKeys.contains(feature.key)) {
+                    continue
+                }
+                feature.rules?.forEach { rule ->
                     if (rule.campaignId == campaignId) {
-                        feature.key?.let { featureKeys.add(it) }
+                        // Check if variationId is provided and matches the rule's variationId
+                        if (variationId != null) {
+                            // Add feature key if variationId matches
+                            if (rule.variationId== variationId) {
+                                feature.key?.let { featureKeys.add(it) }
+                            }
+                        } else {
+                            // Add feature key if no variationId is provided
+                            feature.key?.let { featureKeys.add(it) }
+                        }
                     }
                 }
             }
@@ -255,9 +296,9 @@ object CampaignUtil {
      */
     fun getCampaignIdsFromFeatureKey(settings: Settings, featureKey: String?): List<Int?> {
         val campaignIds: MutableList<Int?> = ArrayList()
-        for (feature in settings.features!!) {
+        for (feature in settings.features) {
             if (feature.key == featureKey) {
-                feature.rules!!.forEach(Consumer { rule: Rule -> campaignIds.add(rule.campaignId) })
+                feature.rules?.forEach { rule: Rule -> campaignIds.add(rule.campaignId) }
             }
         }
         return campaignIds
diff --git a/fme-android/src/main/java/com/vwo/utils/DataTypeUtil.kt b/fme-android/src/main/java/com/vwo/utils/DataTypeUtil.kt
index bb9ce47..9afcd45 100644
--- a/fme-android/src/main/java/com/vwo/utils/DataTypeUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/DataTypeUtil.kt
@@ -16,6 +16,7 @@
 package com.vwo.utils
 
 import com.vwo.utils.NetworkUtil.Companion
+import org.json.JSONObject
 import java.util.Date
 import java.util.function.Function
 
@@ -219,3 +220,14 @@ object DataTypeUtil {
         return cleanedMap
     }
 }
+
+fun JSONObject.toMap(): MutableMap<String, Any> {
+    val map = mutableMapOf<String, Any>()
+    val keys = this.keys()
+    while (keys.hasNext()) {
+        val key = keys.next()
+        val value = this.get(key)
+        map[key] = value
+    }
+    return map
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/utils/DecisionUtil.kt b/fme-android/src/main/java/com/vwo/utils/DecisionUtil.kt
index 4677eb9..1e03343 100644
--- a/fme-android/src/main/java/com/vwo/utils/DecisionUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/DecisionUtil.kt
@@ -15,6 +15,9 @@
  */
 package com.vwo.utils
 
+import com.vwo.VWOClient
+import com.vwo.constants.Constants
+import com.vwo.decorators.StorageDecorator
 import com.vwo.enums.CampaignTypeEnum
 import com.vwo.enums.StatusEnum
 import com.vwo.models.Campaign
@@ -28,6 +31,11 @@ import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
 import com.vwo.services.CampaignDecisionService
 import com.vwo.services.LoggerService.Companion.log
 import com.vwo.services.StorageService
+import com.vwo.utils.CampaignUtil.getGroupDetailsIfCampaignPartOfIt
+import com.vwo.utils.MegUtil.evaluateGroups
+import com.vwo.utils.UUIDUtils.getUUID
+import com.vwo.models.Storage
+
 
 /**
  * Utility object for decision-making operations.
@@ -53,67 +61,182 @@ object DecisionUtil {
         campaign: Campaign,
         context: VWOContext,
         evaluatedFeatureMap: MutableMap<String, Any>,
-        megGroupWinnerCampaigns: MutableMap<Int, Int>?,
-        storageService: StorageService,
+        megGroupWinnerCampaigns: MutableMap<Int, String>?,
+        storageService: StorageService?,
         decision: MutableMap<String, Any>
-    ): Map<String, Any> {
-        val vwoUserId = UUIDUtils.getUUID(context.id, settings.accountId.toString())
-        val campaignId = campaign.id
+    ): MutableMap<String, Any?> {
+        val vwoUserId = getUUID(context.id, settings.accountId.toString())
+        val campaignId = campaign.id!!
 
         // If the campaign is of type AB, set the _vwoUserId for variation targeting variables
         if (campaign.type == CampaignTypeEnum.AB.value) {
             // set _vwoUserId for variation targeting variables
-            val id = if (campaign.isUserListEnabled == true) vwoUserId else context.id
-            id?.let { context.variationTargetingVariables.put("_vwoUserId", it) }
+            context.variationTargetingVariables = object : HashMap<String, Any>() {
+                init {
+                    putAll(context.variationTargetingVariables)
+                    val id = if (campaign.isUserListEnabled == true) vwoUserId else context.id
+                    id?.let { put("_vwoUserId", it) }
+                }
+            }
 
-            // for integration
-            decision["variationTargetingVariables"] = context.variationTargetingVariables
+            decision["variationTargetingVariables"] =
+                context.variationTargetingVariables // for integration
 
             // check if the campaign satisfies the whitelisting
-            if (campaign.isForcedVariationEnabled==true) {
+            if (campaign.isForcedVariationEnabled == true) {
                 val whitelistedVariation = checkCampaignWhitelisting(campaign, context)
                 if (whitelistedVariation != null) {
-                    val variation = whitelistedVariation["variation"]?:""
-                    return mapOf(
-                        "preSegmentationResult" to true,
-                        "whitelistedObject" to variation
-                    )
+                    return object : HashMap<String, Any?>() {
+                        init {
+                            put("preSegmentationResult", true)
+                            put("whitelistedObject", whitelistedVariation["variation"])
+                        }
+                    }
                 }
             } else {
-                log(LogLevelEnum.INFO, "WHITELISTING_SKIP", mapOf(
-                        "userId" to context.id,
-                        "campaignKey" to campaign.ruleKey,
-                ))
+                log(LogLevelEnum.INFO, "WHITELISTING_SKIP", object : HashMap<String?, String?>() {
+                    init {
+                        put("userId", context.id)
+                        put("campaignKey", campaign.ruleKey)
+                    }
+                })
             }
         }
 
         // set _vwoUserId for custom variables
-        val userId=if (campaign.isUserListEnabled == true) vwoUserId else context.id
-        context.customVariables["_vwoUserId"] = userId?:""
+        context.customVariables = object : HashMap<String, Any>() {
+            init {
+                putAll(context.customVariables)
+                val id = if (campaign.isUserListEnabled == true) vwoUserId else context.id
+                id?.let { put("_vwoUserId", it) }
+            }
+        }
 
 
         decision["customVariables"] = context.customVariables // for integration
 
         // Check if RUle being evaluated is part of Mutually Exclusive Group
-        val groupId = CampaignUtil.getGroupDetailsIfCampaignPartOfIt(settings, campaignId?:0)["groupId"]
-        if (!groupId.isNullOrEmpty()) {
-            val groupWinnerCampaignId = megGroupWinnerCampaigns!![groupId.toInt()]
-            if (groupWinnerCampaignId != null && groupWinnerCampaignId.toString().isNotEmpty()
-                && groupWinnerCampaignId == campaignId) {
-                // If the campaign is the winner of the MEG, return true
-                return object : HashMap<String, Any>() {
-                    init {
-                        put("preSegmentationResult", true)
-                        remove("whitelistedObject")
+        val id = if (campaign.type == CampaignTypeEnum.PERSONALIZE.value) campaign.variations?.get(0)?.id?:-1 else -1
+            val groupId = getGroupDetailsIfCampaignPartOfIt(
+                settings,
+                campaign.id!!,
+                id
+            )["groupId"]
+        if (groupId != null && !groupId.isEmpty()) {
+            // check if the group is already evaluated for the user
+            val groupWinnerCampaignId = megGroupWinnerCampaigns?.get(groupId.toInt())
+            if (groupWinnerCampaignId != null && !groupWinnerCampaignId.isEmpty()) {
+                if (campaign.type == CampaignTypeEnum.AB.value) {
+                    if (groupWinnerCampaignId == campaignId.toString()) {
+                        // If the campaign is the winner of the MEG, return true
+                        return object : HashMap<String, Any?>() {
+                            init {
+                                put("preSegmentationResult", true)
+                                put("whitelistedObject", null)
+                            }
+                        }
+                    }
+                } else if (campaign.type == CampaignTypeEnum.PERSONALIZE.value) {
+                    // if personalise then check if the reqeusted variation is the winner
+                    if (groupWinnerCampaignId == campaign.id.toString() + "_" + campaign.variations!![0].id) {
+                        // If the campaign is the winner of the MEG, return true
+                        return object : HashMap<String, Any?>() {
+                            init {
+                                put("preSegmentationResult", true)
+                                put("whitelistedObject", null)
+                            }
+                        }
                     }
                 }
-            } else if (groupWinnerCampaignId != null && groupWinnerCampaignId.toString().isNotEmpty()) {
                 // If the campaign is not the winner of the MEG, return false
-                return object : HashMap<String, Any>() {
+                return object : HashMap<String, Any?>() {
                     init {
                         put("preSegmentationResult", false)
-                        remove("whitelistedObject")
+                        put("whitelistedObject", null)
+                    }
+                }
+            } else {
+                // check in storage if the group is already evaluated for the user
+                val storedDataMap = StorageDecorator().getFeatureFromStorage(
+                    Constants.VWO_META_MEG_KEY + groupId, context,
+                    storageService!!
+                )
+                try {
+                    val storageMapAsString =
+                        VWOClient.objectMapper.writeValueAsString(storedDataMap)
+                    val storedData: Storage? = VWOClient.objectMapper.readValue(
+                        storageMapAsString,
+                        Storage::class.java
+                    )
+                    if (storedData != null && storedData.experimentId != null && storedData.experimentKey != null) {
+                        log(
+                            LogLevelEnum.INFO,
+                            "MEG_CAMPAIGN_FOUND_IN_STORAGE",
+                            object : HashMap<String?, String?>() {
+                                init {
+                                    put("campaignKey", storedData.experimentKey)
+                                    put("userId", context.id)
+                                }
+                            })
+                        if (storedData.experimentId === campaignId) {
+                            if (campaign.type == CampaignTypeEnum.PERSONALIZE.value) {
+                                // if personalise then check if the reqeusted variation is the winner
+                                if (storedData.experimentVariationId==campaign.variations!![0].id) {
+                                    return object : HashMap<String, Any?>() {
+                                        init {
+                                            put("preSegmentationResult", true)
+                                            put("whitelistedObject", null)
+                                        }
+                                    }
+                                } else {
+                                    // store the campaign in local cache, so that it can be used later without looking into user storage again
+                                    megGroupWinnerCampaigns?.set(groupId.toInt(),
+                                        "${storedData.experimentId}_${storedData.experimentVariationId}"
+                                    )
+                                    return object : HashMap<String, Any?>() {
+                                        init {
+                                            put("preSegmentationResult", false)
+                                            put("whitelistedObject", null)
+                                        }
+                                    }
+                                }
+                            } else {
+                                // return the campaign if the called campaignId matches
+                                return object : HashMap<String, Any?>() {
+                                    init {
+                                        put("preSegmentationResult", true)
+                                        put("whitelistedObject", null)
+                                    }
+                                }
+                            }
+                        }
+                        // if experimentId is not -1 then campaign is personalise campaign, store the details and return
+                        if (storedData.experimentVariationId !== -1) {
+                            megGroupWinnerCampaigns?.set(groupId.toInt(),
+                                "${storedData.experimentId}_${storedData.experimentVariationId}"
+                            )
+                        } else {
+                            // else store the campaignId only and return
+                            megGroupWinnerCampaigns?.set(groupId.toInt(),
+                                java.lang.String.valueOf(storedData.experimentId)
+                            )
+                        }
+                        return object : HashMap<String, Any?>() {
+                            init {
+                                put("preSegmentationResult", false)
+                                put("whitelistedObject", null)
+                            }
+                        }
                     }
+                } catch (e: Exception) {
+                    log(
+                        LogLevelEnum.ERROR,
+                        "STORED_DATA_ERROR",
+                        object : HashMap<String?, String?>() {
+                            init {
+                                put("err", e.toString())
+                            }
+                        })
                 }
             }
         }
@@ -122,35 +245,78 @@ object DecisionUtil {
         val isPreSegmentationPassed =
             CampaignDecisionService().getPreSegmentationDecision(campaign, context)
 
-        if (isPreSegmentationPassed && !groupId.isNullOrEmpty()) {
-            val variationModel = MegUtil.evaluateGroups(
+        if (isPreSegmentationPassed && groupId != null && groupId.isNotEmpty()) {
+            val variationModel = evaluateGroups(
                 settings,
                 feature,
                 groupId.toInt(),
                 evaluatedFeatureMap,
                 context,
-                storageService
+                storageService!!
             )
+            // this condition would be true only when the current campaignId match with group winner campaignId
+            // for personalise campaign, all personalise variations have same campaignId, so we check for campaignId_variationId
             if (variationModel?.id != null && variationModel.id == campaignId) {
-                return object : HashMap<String, Any>() {
+                // if campaign is AB then return true
+                if (variationModel.type== CampaignTypeEnum.AB.value) {
+                    return object : HashMap<String, Any?>() {
+                        init {
+                            put("preSegmentationResult", true)
+                            put("whitelistedObject", null)
+                        }
+                    }
+                } else {
+                    // if personalise then check if the requested variation is the winner
+                    if (variationModel.variations[0].id == campaign.variations!![0].id) {
+                        return object : HashMap<String, Any?>() {
+                            init {
+                                put("preSegmentationResult", true)
+                                put("whitelistedObject", null)
+                            }
+                        }
+                    } else {
+                        // store the campaign in local cache, so that it can be used later
+                        megGroupWinnerCampaigns?.set(groupId.toInt(),
+                            variationModel.id.toString() + "_" + variationModel.variations[0].id
+                        )
+                        return object : HashMap<String, Any?>() {
+                            init {
+                                put("preSegmentationResult", false)
+                                put("whitelistedObject", null)
+                            }
+                        }
+                    }
+                }
+            } else if (variationModel?.id != null) { // when there is a winner but not the current campaign
+                if (variationModel.type==CampaignTypeEnum.AB.value) {
+                    // if campaign is AB then store only the campaignId
+                    megGroupWinnerCampaigns?.set(groupId.toInt(), variationModel.id.toString())
+                } else {
+                    // if campaign is personalise then store the campaignId_variationId
+                    megGroupWinnerCampaigns?.set(groupId.toInt(),
+                        variationModel.id.toString() + "_" + variationModel.variations[0].id
+                    )
+                }
+                return object : HashMap<String, Any?>() {
                     init {
-                        put("preSegmentationResult", true)
-                        remove("whitelistedObject")
+                        put("preSegmentationResult", false)
+                        put("whitelistedObject", null)
                     }
                 }
             }
-            megGroupWinnerCampaigns!![groupId.toInt()] = variationModel?.id?:0
-            return object : HashMap<String, Any>() {
+            // store -1 if no winner found, so that we don't evaluate the group again as the result would be the same for the current getFlag call
+            megGroupWinnerCampaigns?.set(groupId.toInt(), "-1")
+            return object : HashMap<String, Any?>() {
                 init {
                     put("preSegmentationResult", false)
-                    remove("whitelistedObject")
+                    put("whitelistedObject", null)
                 }
             }
         }
-        return object : HashMap<String, Any>() {
+        return object : HashMap<String, Any?>() {
             init {
                 put("preSegmentationResult", isPreSegmentationPassed)
-                remove("whitelistedObject")
+                put("whitelistedObject", null)
             }
         }
     }
@@ -181,7 +347,13 @@ object DecisionUtil {
                 object : HashMap<String?, String?>() {
                     init {
                         put("userId", userId)
-                        put("campaignKey", campaign.ruleKey)
+                        put(
+                            "campaignKey",
+                            if (campaign.type.equals(CampaignTypeEnum.AB.value))
+                                campaign.key
+                            else
+                                campaign.name + "_" + campaign.ruleKey
+                        )
                         put("status", "did not get any variation")
                     }
                 })
@@ -215,7 +387,13 @@ object DecisionUtil {
         log(LogLevelEnum.INFO, "WHITELISTING_STATUS", object : HashMap<String?, String?>() {
             init {
                 put("userId", context.id)
-                put("campaignKey", campaign.ruleKey)
+                put(
+                    "campaignKey",
+                    if (campaign.type.equals(CampaignTypeEnum.AB.value))
+                        campaign.key
+                    else
+                        campaign.name + "_" + campaign.ruleKey
+                )
                 put("status", status.status)
                 put("variationString", variationString)
             }
@@ -237,10 +415,16 @@ object DecisionUtil {
                 log(LogLevelEnum.INFO, "WHITELISTING_SKIP", object : HashMap<String?, String?>() {
                     init {
                         put("userId", context.id)
-                        put("campaignKey", campaign.ruleKey)
+                        put(
+                            "campaignKey",
+                            if (campaign.type.equals(CampaignTypeEnum.AB.value))
+                                campaign.key
+                            else
+                                campaign.name + "_" + campaign.ruleKey
+                        )
                         put(
                             "variation",
-                            if (variation.name?.isNotEmpty()==true) "for variation: " + variation.name else ""
+                            if (variation.name?.isNotEmpty() == true) "for variation: " + variation.name else ""
                         )
                     }
                 })
diff --git a/fme-android/src/main/java/com/vwo/utils/EventsUtils.kt b/fme-android/src/main/java/com/vwo/utils/EventsUtils.kt
new file mode 100644
index 0000000..d73a0ce
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/utils/EventsUtils.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.utils
+
+import com.vwo.enums.UrlEnum
+import com.vwo.models.user.VWOContext
+import com.vwo.packages.network_layer.manager.NetworkManager
+import com.vwo.packages.network_layer.models.RequestModel
+import com.vwo.services.SettingsManager.Companion.instance
+import com.vwo.services.UrlService.baseUrl
+
+/**
+ * Utility class for handling events related operations, such as pre-segmentation.
+ *
+ * This class provides methods for evaluating DSLs against user context to determine if events
+ * should be tracked before segmentation. It also includes helper functions for validating
+ * event data and other related tasks.
+ */
+class EventsUtils {
+
+    /**
+     * Evaluates the given DSL against the provided context to determine if the event
+     * should be tracked before segmentation.
+     *
+     * This function sends a POST request to the VWO server with the DSL and context
+     * information. It returns `true` if the server responds with a status code of 200
+     * and the response data contains "true" (case-insensitive), indicating that the
+     * event should be tracked. Otherwise, it returns `false`.
+     *
+     * @param dsl The DSL to evaluate.
+     * @param context The VWO context containing user information.
+     * @return `true` if the event should be tracked before segmentation, `false` otherwise.
+     */
+    fun getEventsPreSegmentation(dsl: Any, context: VWOContext): Boolean {
+        var result = false
+        val queryParams: MutableMap<String, String> = HashMap()
+        val accountId = instance?.accountId.toString()
+        queryParams["uuid"] = UUIDUtils.getUUID(context.id, accountId)
+        queryParams["accountId"] = accountId
+
+        val body: MutableMap<String, Any> = LinkedHashMap()
+        body["dsl"] = dsl
+        val contextBody = mutableMapOf<String, Any>()
+        contextBody["id"] = context.id ?: ""
+        contextBody["customVariables"] = context.customVariables
+        contextBody["ipAddress"] = context.ipAddress
+        contextBody["userAgent"] = context.userAgent
+        contextBody["variationTargetingVariables"] = context.variationTargetingVariables
+        body["context"] = contextBody
+
+        NetworkManager.attachClient()
+        val request = RequestModel(
+            baseUrl,
+            "POST",
+            UrlEnum.EVALUATE_DSL.url,
+            queryParams,
+            body,
+            HashMap(),
+            instance?.protocol,
+            instance?.port ?: 0
+        )
+        val responseModel = NetworkManager.post(request)
+        if (responseModel?.statusCode == 200) {
+            if (responseModel.data?.contains("true", ignoreCase = true) == true) {
+                result = true
+            }
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/main/java/com/vwo/utils/GatewayServiceUtil.kt b/fme-android/src/main/java/com/vwo/utils/GatewayServiceUtil.kt
index 2175949..67b4e9e 100644
--- a/fme-android/src/main/java/com/vwo/utils/GatewayServiceUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/GatewayServiceUtil.kt
@@ -45,6 +45,7 @@ object GatewayServiceUtil {
             log(LogLevelEnum.ERROR, "GATEWAY_URL_ERROR", null)
             return null
         }
+        var responseString: String? = null
         try {
             val request = RequestModel(
                 baseUrl,
@@ -58,10 +59,11 @@ object GatewayServiceUtil {
             )
             val response = NetworkManager.get(request)
 
-            return response?.data
+            responseString = response?.data
         } catch (e: Exception) {
-            return null
+            responseString = null
         }
+        return responseString
     }
 
     /**
diff --git a/fme-android/src/main/java/com/vwo/utils/ImpressionUtil.kt b/fme-android/src/main/java/com/vwo/utils/ImpressionUtil.kt
index d849e58..7c5b759 100644
--- a/fme-android/src/main/java/com/vwo/utils/ImpressionUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/ImpressionUtil.kt
@@ -55,6 +55,7 @@ object ImpressionUtil {
         // Construct payload data for tracking the user
         val payload: Map<String, Any> = NetworkUtil.getTrackUserPayloadData(
             settings,
+            context,
             context.id,
             EventEnum.VWO_VARIATION_SHOWN.value,
             campaignId,
diff --git a/fme-android/src/main/java/com/vwo/utils/MegUtil.kt b/fme-android/src/main/java/com/vwo/utils/MegUtil.kt
index 07bb472..a521916 100644
--- a/fme-android/src/main/java/com/vwo/utils/MegUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/MegUtil.kt
@@ -29,13 +29,14 @@ import com.vwo.models.user.VWOContext
 import com.vwo.packages.decision_maker.DecisionMaker
 import com.vwo.packages.logger.enums.LogLevelEnum
 import com.vwo.services.CampaignDecisionService
-import com.vwo.services.LoggerService
+import com.vwo.services.LoggerService.Companion.log
 import com.vwo.services.StorageService
-import java.util.function.Consumer
-import java.util.function.Function
-import java.util.function.Predicate
+import com.vwo.utils.CampaignUtil.getBucketingSeed
+import com.vwo.utils.CampaignUtil.setCampaignAllocation
+import com.vwo.utils.FunctionUtil.cloneObject
 import java.util.stream.Collectors
 
+
 /**
  * Utility object for MEG-related operations.
  *
@@ -61,17 +62,15 @@ object MegUtil {
         storageService: StorageService
     ): Variation? {
         val featureToSkip: MutableList<String?> = ArrayList()
-        val campaignMap: MutableMap<String, MutableList<Campaign>> =
-            HashMap<String, MutableList<Campaign>>()
+        val campaignMap: MutableMap<String, MutableList<Campaign>> = HashMap()
 
         // get all feature keys and all campaignIds from the groupId
         val featureKeysAndGroupCampaignIds = getFeatureKeysFromGroup(settings, groupId)
         val featureKeys = featureKeysAndGroupCampaignIds["featureKeys"] as List<String>?
-        val groupCampaignIds = featureKeysAndGroupCampaignIds["groupCampaignIds"] as List<Int>?
+        val groupCampaignIds:List<String>? = featureKeysAndGroupCampaignIds["groupCampaignIds"] as List<String>?
 
         for (featureKey in featureKeys!!) {
             val currentFeature = FunctionUtil.getFeatureFromKey(settings, featureKey)
-            val featureCampaignIds = CampaignUtil.getCampaignIdsFromFeatureKey(settings, featureKey)
 
             // check if the feature is already evaluated
             if (currentFeature == null || featureToSkip.contains(featureKey)) {
@@ -88,18 +87,19 @@ object MegUtil {
                 storageService
             )
             if (isRolloutRulePassed) {
-                for (campaign in settings.campaigns!!) {
-                    if (groupCampaignIds!!.contains(campaign.id)
-                        && featureCampaignIds.contains(campaign.id)
-                    ) {
-                        // Ensuring the list for a featureKey exists in the map
-                        val campaigns: MutableList<Campaign> =
-                            campaignMap.getOrPut(featureKey) { mutableListOf() }
-
-                        // Checking if the campaign with a specific key does not already exist in
-                        // the list and adding it if not
-                        if (campaigns.none { it.key == campaign.key }) {
-                            campaigns.add(campaign)
+                for (feature1 in settings.features) {
+                    if (feature1.key == featureKey) {
+                        for (campaign in feature1.rulesLinkedCampaign) {
+                            if (groupCampaignIds!!.contains(campaign.id.toString())
+                                || groupCampaignIds.contains(campaign.id.toString()
+                                        + "_" + campaign.variations!![0].id)) {
+
+                                campaignMap.getOrPut(featureKey) { mutableListOf() }
+                                val campaigns = campaignMap[featureKey]
+                                if (campaigns!!.none { it.ruleKey == campaign.ruleKey }) {
+                                    campaigns.add(campaign)
+                                }
+                            }
                         }
                     }
                 }
@@ -119,7 +119,8 @@ object MegUtil {
             eligibleCampaigns,
             eligibleCampaignsWithStorage,
             groupId,
-            context
+            context,
+            storageService
         )
     }
 
@@ -208,7 +209,7 @@ object MegUtil {
         }
 
         // no rollout rule, evaluate experiments
-        LoggerService.log(LogLevelEnum.INFO, "MEG_SKIP_ROLLOUT_EVALUATE_EXPERIMENTS",
+        log(LogLevelEnum.INFO, "MEG_SKIP_ROLLOUT_EVALUATE_EXPERIMENTS",
             object : HashMap<String?, String?>() {
                 init {
                     put("featureKey", featureKey)
@@ -240,11 +241,10 @@ object MegUtil {
                 try {
                     val storageMapAsString: String =
                         VWOClient.objectMapper.writeValueAsString(storedDataMap)
-                    val storedData: Storage =
-                        VWOClient.objectMapper.readValue(storageMapAsString, Storage::class.java)
-                    if (storedData.experimentVariationId != null && storedData.experimentVariationId.toString()
-                            .isNotEmpty()
-                    ) {
+                    val storedData: Storage? = VWOClient.objectMapper.readValue(storageMapAsString, Storage::class.java)
+                    if (storedData?.experimentVariationId != null
+                        && storedData.experimentVariationId.toString().isNotEmpty()) {
+
                         if (!storedData.experimentKey.isNullOrEmpty() && storedData.experimentKey == campaign.key) {
                             val variation: Variation? = CampaignUtil.getVariationFromCampaignKey(
                                 settings,
@@ -252,7 +252,7 @@ object MegUtil {
                                 storedData.experimentVariationId!!
                             )
                             if (variation != null) {
-                                LoggerService.log(
+                                log(
                                     LogLevelEnum.INFO,
                                     "MEG_CAMPAIGN_FOUND_IN_STORAGE",
                                     object : HashMap<String?, String?>() {
@@ -275,12 +275,15 @@ object MegUtil {
                 if (CampaignDecisionService().getPreSegmentationDecision(campaign, context) &&
                     CampaignDecisionService().isUserPartOfCampaign(context.id, campaign)
                 ) {
-                    LoggerService.log(
+                    log(
                         LogLevelEnum.INFO,
                         "MEG_CAMPAIGN_ELIGIBLE",
                         object : HashMap<String?, String?>() {
                             init {
-                                put("campaignKey", campaign.key)
+                                put(
+                                    "campaignKey",
+                                    if (campaign.type == CampaignTypeEnum.AB.value) campaign.key else campaign.name + "_" + campaign.ruleKey
+                                )
                                 put("userId", context.id)
                             }
                         })
@@ -309,13 +312,14 @@ object MegUtil {
      * @param eligibleCampaignsWithStorage - A list of eligible campaigns with storage.
      * @param groupId - The ID of the group.
      * @param context - The context model.
+     * @param storageService - The storage service.
      * @return The winner campaign.
      */
     private fun findWinnerCampaignAmongEligibleCampaigns(
         settings: Settings, featureKey: String?,
         eligibleCampaigns: List<Campaign>?,
         eligibleCampaignsWithStorage: List<Campaign>?,
-        groupId: Int, context: VWOContext
+        groupId: Int, context: VWOContext, storageService: StorageService
     ): Variation? {
         val campaignIds = CampaignUtil.getCampaignIdsFromFeatureKey(settings, featureKey)
         var winnerCampaign: Variation? = null
@@ -335,11 +339,14 @@ object MegUtil {
                 }
                 val finalWinnerCampaign: Variation? = winnerCampaign
                 val map = mutableMapOf<String, String>().apply {
-                    finalWinnerCampaign?.key?.let { put("campaignKey", it) }
+                    put(
+                        "campaignKey",
+                        (if (finalWinnerCampaign?.type.equals(CampaignTypeEnum.AB.value)) finalWinnerCampaign!!.key else finalWinnerCampaign!!.name + "_" + finalWinnerCampaign.ruleKey)!!
+                    )
                     put("groupId", groupId.toString())
                     context.id?.let { put("userId", it) }
                 }
-                LoggerService.log(
+                log(
                     LogLevelEnum.INFO,
                     "MEG_WINNER_CAMPAIGN",
                     map as Map<String?, String?>
@@ -349,7 +356,8 @@ object MegUtil {
                     eligibleCampaignsWithStorage,
                     context,
                     campaignIds,
-                    groupId
+                    groupId,
+                    storageService
                 )
             } else if (eligibleCampaignsWithStorage.size > 1) {
                 winnerCampaign = getCampaignUsingAdvancedAlgo(
@@ -357,7 +365,8 @@ object MegUtil {
                     eligibleCampaignsWithStorage,
                     context,
                     campaignIds,
-                    groupId
+                    groupId,
+                    storageService
                 )
             }
 
@@ -372,13 +381,18 @@ object MegUtil {
                     } catch (e: JsonProcessingException) {
                         throw RuntimeException(e)
                     }
-                    val finalWinnerCampaign1: Variation? = winnerCampaign
-                    LoggerService.log(
+                    val finalWinnerCampaign1: Variation = winnerCampaign
+                    log(
                         LogLevelEnum.INFO,
                         "MEG_WINNER_CAMPAIGN",
                         object : HashMap<String?, String?>() {
                             init {
-                                put("campaignKey", finalWinnerCampaign1?.key)
+                                put("campaignKey",
+                                    if (finalWinnerCampaign1.type.equals(CampaignTypeEnum.AB.value))
+                                        finalWinnerCampaign1.key
+                                    else
+                                        finalWinnerCampaign1.name + "_" + finalWinnerCampaign1.ruleKey
+                                )
                                 put("groupId", groupId.toString())
                                 put("userId", context.id)
                                 put("algo", "")
@@ -389,7 +403,8 @@ object MegUtil {
                         eligibleCampaigns,
                         context,
                         campaignIds,
-                        groupId
+                        groupId,
+                        storageService
                     )
                 } else if (eligibleCampaigns.size > 1) {
                     winnerCampaign = getCampaignUsingAdvancedAlgo(
@@ -397,15 +412,14 @@ object MegUtil {
                         eligibleCampaigns,
                         context,
                         campaignIds,
-                        groupId
+                        groupId,
+                        storageService
                     )
                 }
             }
         } catch (exception: Exception) {
-            LoggerService.log(
-                LogLevelEnum.ERROR,
-                "MEG: error inside findWinnerCampaignAmongEligibleCampaigns$exception"
-            )
+            log(LogLevelEnum.ERROR,
+                "MEG: error inside findWinnerCampaignAmongEligibleCampaigns$exception")
         }
         return winnerCampaign
     }
@@ -421,11 +435,11 @@ object MegUtil {
      */
     private fun normalizeWeightsAndFindWinningCampaign(
         shortlistedCampaigns: List<Campaign>?,
-        context: VWOContext, calledCampaignIds: List<Int?>?, groupId: Int
+        context: VWOContext, calledCampaignIds: List<Int?>?, groupId: Int, storageService:StorageService
     ): Variation? {
         try {
-            shortlistedCampaigns?.forEach { campaign: Campaign ->
-                campaign.weight = 100.0 / shortlistedCampaigns.size
+            shortlistedCampaigns?.forEach{ campaign: Campaign ->
+                campaign.weight = Math.round(100.0 / shortlistedCampaigns.size) * 10000 / 10000.0
             }
 
             val variations: List<Variation> = shortlistedCampaigns?.mapNotNull { campaign ->
@@ -446,23 +460,35 @@ object MegUtil {
                 )
             )
 
-            LoggerService.log(
+            if (winnerVariation != null) {
+            log(
                 LogLevelEnum.INFO,
                 "MEG_WINNER_CAMPAIGN",
                 object : HashMap<String?, String?>() {
                     init {
-                        put("campaignKey", winnerVariation?.key)
+                        put("campaignKey", if(winnerVariation.type==CampaignTypeEnum.AB.value) winnerVariation.key else winnerVariation.name + "_" + winnerVariation.ruleKey)
                         put("groupId", groupId.toString())
                         put("userId", context.id)
                         put("algo", "using random algorithm")
                     }
                 })
 
-            if (winnerVariation != null && calledCampaignIds?.contains(winnerVariation.id) == true) {
-                return winnerVariation
+                val storageMap: MutableMap<String, Any> = java.util.HashMap()
+                storageMap["featureKey"] = Constants.VWO_META_MEG_KEY + groupId
+                storageMap["userId"] = context.id?:0
+                storageMap["experimentId"] = winnerVariation.id?:0
+                storageMap["experimentKey"] = winnerVariation.key?:""
+                storageMap["experimentVariationId"] = if (winnerVariation.type.equals(CampaignTypeEnum.PERSONALIZE.value)) winnerVariation.variations[0].id?:-1 else -1
+                StorageDecorator().setDataInStorage(storageMap, storageService)
+
+                if (calledCampaignIds!!.contains(winnerVariation.id)) {
+                    return winnerVariation
+                }
+            } else {
+                log(LogLevelEnum.INFO, "No winner campaign found for MEG group: $groupId")
             }
         } catch (exception: Exception) {
-            LoggerService.log(
+            log(
                 LogLevelEnum.ERROR,
                 "MEG: error inside normalizeWeightsAndFindWinningCampaign"
             )
@@ -478,27 +504,45 @@ object MegUtil {
      * @param context - The context model.
      * @param calledCampaignIds - A list of campaign IDs that have been called.
      * @param groupId - The ID of the group.
+     * @param storageService - The storage service.
      * @return The winning campaign or null if none is found.
      */
     private fun getCampaignUsingAdvancedAlgo(
-        settings: Settings, shortlistedCampaigns: List<Campaign>,
-        context: VWOContext, calledCampaignIds: List<Int?>?, groupId: Int
+        settings: Settings,
+        shortlistedCampaigns: List<Campaign>,
+        context: VWOContext,
+        calledCampaignIds: List<Int?>,
+        groupId: Int,
+        storageService: StorageService
     ): Variation? {
         var winnerCampaign: Variation? = null
         var found = false
         try {
             val group = settings.groups!![groupId.toString()]
-            val priorityOrder = group?.p ?: mutableListOf()
-            val groupWt = group?.wt
-            val wt = if (!groupWt.isNullOrEmpty()) convertWtToMap(groupWt) else mutableMapOf()
-            for (integer in priorityOrder) {
+            val priorityOrder: List<String>? = if (group != null && !group.p!!.isEmpty()
+            ) group.p else java.util.ArrayList()
+            val wt = if (group != null && !group.wt!!.isEmpty()
+            ) group.wt else java.util.HashMap()
+            for (integer in priorityOrder!!) {
                 for (shortlistedCampaign in shortlistedCampaigns) {
-                    if (shortlistedCampaign.id == integer) {
-                        val campaignModel: String = VWOClient.objectMapper.writeValueAsString(
-                            FunctionUtil.cloneObject(shortlistedCampaign)
+                    if (shortlistedCampaign.id.toString() == integer) {
+                        val campaignModel = VWOClient.objectMapper.writeValueAsString(
+                            cloneObject(shortlistedCampaign)
+                        )
+                        winnerCampaign = VWOClient.objectMapper.readValue(
+                            campaignModel,
+                            Variation::class.java
+                        )
+                        found = true
+                        break
+                    } else if ((shortlistedCampaign.id.toString() + "_" + shortlistedCampaign.variations!![0].id) == integer) {
+                        val campaignModel = VWOClient.objectMapper.writeValueAsString(
+                            cloneObject(shortlistedCampaign)
+                        )
+                        winnerCampaign = VWOClient.objectMapper.readValue(
+                            campaignModel,
+                            Variation::class.java
                         )
-                        winnerCampaign =
-                            VWOClient.objectMapper.readValue(campaignModel, Variation::class.java)
                         found = true
                         break
                     }
@@ -507,33 +551,38 @@ object MegUtil {
             }
 
             if (winnerCampaign == null) {
-                val participatingCampaignList: MutableList<Campaign?> = ArrayList<Campaign?>()
+                val participatingCampaignList: MutableList<Campaign?> = java.util.ArrayList()
                 for (campaign in shortlistedCampaigns) {
-                    val campaignId = campaign.id
-                    if (campaignId!=null && wt.containsKey(campaignId)) {
-                        val clonedCampaign: Campaign =
-                            FunctionUtil.cloneObject(campaign) as Campaign
-                        clonedCampaign.weight = (wt[campaignId]?:0).toDouble()
+                    val campaignId = campaign.id!!
+                    if (wt!!.containsKey(campaignId.toString())) {
+                        val clonedCampaign = cloneObject(campaign) as Campaign?
+                        clonedCampaign!!.weight = wt!![campaignId.toString()]!!
+                        participatingCampaignList.add(clonedCampaign)
+                    } else if (wt!!.containsKey(campaignId.toString() + "_" + campaign.variations!![0].id)) {
+                        val clonedCampaign = cloneObject(campaign) as Campaign?
+                        clonedCampaign!!.weight =
+                            wt!![campaignId.toString() + "_" + campaign.variations!![0].id]!!
                         participatingCampaignList.add(clonedCampaign)
                     }
                 }
 
-                val variations: List<Variation> = participatingCampaignList.mapNotNull { campaign ->
-                    try {
-                        val campaignModel = VWOClient.objectMapper.writeValueAsString(campaign)
-                        VWOClient.objectMapper.readValue(campaignModel, Variation::class.java)
-                    } catch (e: JsonProcessingException) {
-                        LoggerService.log(LogLevelEnum.ERROR,e.toString())
-                        null // Optionally log the error or handle it as needed
+                val variations = participatingCampaignList.map { campaign: Campaign? ->
+                        try {
+                            val campaignModel = VWOClient.objectMapper.writeValueAsString(campaign)
+                            return@map VWOClient.objectMapper.readValue<Variation>(
+                                campaignModel,
+                                Variation::class.java
+                            )
+                        } catch (e: JsonProcessingException) {
+                            throw java.lang.RuntimeException(e)
+                        }
                     }
-                }
-
 
-                CampaignUtil.setCampaignAllocation(variations)
+                setCampaignAllocation(variations)
                 winnerCampaign = CampaignDecisionService().getVariation(
                     variations,
                     DecisionMaker().calculateBucketValue(
-                        CampaignUtil.getBucketingSeed(
+                        getBucketingSeed(
                             context.id,
                             null,
                             groupId
@@ -542,24 +591,45 @@ object MegUtil {
                 )
             }
 
-            val finalWinnerCampaign: Variation? = winnerCampaign
-            LoggerService.log(
-                LogLevelEnum.INFO,
-                "MEG_WINNER_CAMPAIGN",
-                object : HashMap<String?, String?>() {
-                    init {
-                        put("campaignKey", finalWinnerCampaign?.name)
-                        put("groupId", groupId.toString())
-                        put("userId", context.id)
-                        put("algo", "using advanced algorithm")
-                    }
-                })
+            val finalWinnerCampaign = winnerCampaign
+
 
-            if (calledCampaignIds!!.contains(winnerCampaign?.id)) {
-                return winnerCampaign
+            if (winnerCampaign != null) {
+                log(
+                    LogLevelEnum.INFO,
+                    "MEG_WINNER_CAMPAIGN",
+                    object : java.util.HashMap<String?, String?>() {
+                        init {
+                            put(
+                                "campaignKey",
+                                if (finalWinnerCampaign!!.type == CampaignTypeEnum.AB.value) finalWinnerCampaign!!.key else finalWinnerCampaign!!.name + "_" + finalWinnerCampaign!!.ruleKey
+                            )
+                            put("groupId", groupId.toString())
+                            put("userId", context.id)
+                            put("algo", "using advanced algorithm")
+                        }
+                    })
+
+                val storageMap: MutableMap<String, Any> = java.util.HashMap()
+                storageMap["featureKey"] = Constants.VWO_META_MEG_KEY + groupId
+                storageMap["userId"] = context.id?:0
+                storageMap["experimentId"] = winnerCampaign.id?:0
+                storageMap["experimentKey"] = winnerCampaign.key?:""
+                storageMap["experimentVariationId"] =
+                    if (winnerCampaign.type == CampaignTypeEnum.PERSONALIZE.value) winnerCampaign.variations[0].id?:-1 else -1
+                StorageDecorator().setDataInStorage(storageMap, storageService)
+
+                if (calledCampaignIds.contains(winnerCampaign.id)) {
+                    return winnerCampaign
+                }
+            } else {
+                log(
+                    LogLevelEnum.INFO,
+                    "No winner campaign found for MEG group: $groupId"
+                )
             }
-        } catch (exception: Exception) {
-            LoggerService.log(
+        } catch (exception: java.lang.Exception) {
+            log(
                 LogLevelEnum.ERROR,
                 "MEG: error inside getCampaignUsingAdvancedAlgo " + exception.message
             )
@@ -573,8 +643,9 @@ object MegUtil {
      * @param wt - The weight map.
      * @return The converted map.
      */
-    private fun convertWtToMap(wt: Map<String, Int>): Map<Int, Int> {
+    private fun convertWtToMap(wt: Map<String, Int>?): Map<Int, Int> {
         val wtToReturn: MutableMap<Int, Int> = HashMap()
+        if (wt == null) return wtToReturn
         for ((key, value) in wt) {
             wtToReturn[key.toInt()] = value
         }
diff --git a/fme-android/src/main/java/com/vwo/utils/NetworkUtil.kt b/fme-android/src/main/java/com/vwo/utils/NetworkUtil.kt
index ad4461e..cef5503 100644
--- a/fme-android/src/main/java/com/vwo/utils/NetworkUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/NetworkUtil.kt
@@ -93,6 +93,7 @@ class NetworkUtil {
          */
         fun getEventBasePayload(
             settings: Settings,
+            context: VWOContext,
             userId: String?,
             eventName: String,
             visitorUserAgent: String?,
@@ -100,12 +101,12 @@ class NetworkUtil {
         ): EventArchPayload {
             val uuid = UUIDUtils.getUUID(userId, settings.accountId.toString())
             val eventArchData = EventArchData()
-            eventArchData.msgId = generateMsgId(uuid)
+            eventArchData.msgId = generateMsgId(uuid, context)
             eventArchData.visId = uuid
-            eventArchData.sessionId = generateSessionId()
+            eventArchData.sessionId = generateSessionId(context)
             setOptionalVisitorData(eventArchData, visitorUserAgent, ipAddress)
 
-            val event = createEvent(eventName, settings)
+            val event = createEvent(eventName, settings, context)
             eventArchData.event = event
 
             val visitor = createVisitor(settings)
@@ -142,12 +143,19 @@ class NetworkUtil {
          * @param settings The settings model containing configuration.
          * @return The event model.
          */
-        private fun createEvent(eventName: String, settings: Settings): Event {
+        private fun createEvent(eventName: String, settings: Settings, context: VWOContext): Event {
             val event = Event()
             val props = createProps(settings)
+            var time = Calendar.getInstance().timeInMillis
+
+            // Commenting this code as it causing same time in all the events.
+//            if (context.sessionId != 0L) {
+//                time = context.sessionId
+//            }
+
             event.props = props
             event.name = eventName
-            event.time = Calendar.getInstance().timeInMillis
+            event.time = time
             return event
         }
 
@@ -161,6 +169,7 @@ class NetworkUtil {
             props.setSdkName(Constants.SDK_NAME)
             props.setSdkVersion(SDKMetaUtil.sdkVersion)
             props.setEnvKey(settings.sdkKey)
+            props.setEnvKey(settings.sdkKey)
             return props
         }
 
@@ -172,7 +181,7 @@ class NetworkUtil {
         private fun createVisitor(settings: Settings): Visitor {
             val visitor = Visitor()
             val visitorProps: MutableMap<String, Any> = HashMap()
-            visitorProps[Constants.VWO_FS_ENVIRONMENT] = settings.sdkKey?:defaultString
+            visitorProps[Constants.VWO_FS_ENVIRONMENT] = settings.sdkKey ?: defaultString
             visitor.setProps(visitorProps)
             return visitor
         }
@@ -190,6 +199,7 @@ class NetworkUtil {
          */
         fun getTrackUserPayloadData(
             settings: Settings,
+            context: VWOContext,
             userId: String?,
             eventName: String,
             campaignId: Int,
@@ -198,7 +208,14 @@ class NetworkUtil {
             ipAddress: String?
         ): Map<String, Any> {
             val properties =
-                getEventBasePayload(settings, userId, eventName, visitorUserAgent, ipAddress)
+                getEventBasePayload(
+                    settings,
+                    context,
+                    userId,
+                    eventName,
+                    visitorUserAgent,
+                    ipAddress
+                )
             properties.d!!.event!!.props!!.id = campaignId
             properties.d!!.event!!.props!!.variation = variationId.toString()
             properties.d!!.event!!.props!!.setIsFirst(1)
@@ -235,6 +252,7 @@ class NetworkUtil {
         ): Map<String, Any?> {
             val properties = getEventBasePayload(
                 settings,
+                context,
                 userId,
                 eventName,
                 context.userAgent,
@@ -282,12 +300,13 @@ class NetworkUtil {
          */
         fun getAttributePayloadData(
             settings: Settings,
+            context: VWOContext,
             userId: String?,
             eventName: String,
             attributeKey: String,
             attributeValue: Any
         ): Map<String, Any?> {
-            val properties = getEventBasePayload(settings, userId, eventName, null, null)
+            val properties = getEventBasePayload(settings, context, userId, eventName, null, null)
             properties.d?.event?.props?.setIsCustomEvent(true)
             properties.d?.visitor?.props?.set(attributeKey, attributeValue)
             log(
@@ -388,15 +407,25 @@ class NetworkUtil {
          * @param uuid The UUID of the user.
          * @return The message ID.
          */
-        private fun generateMsgId(uuid: String?): String {
-            return uuid + "-" + Calendar.getInstance().timeInMillis
+        private fun generateMsgId(uuid: String?, context: VWOContext): String {
+            var time = Calendar.getInstance().timeInMillis
+
+            if (context.sessionId != 0L) {
+                time = context.sessionId
+            }
+
+            return uuid + "-" + time
         }
 
         /**
          * Generates a session ID for the event.
          * @return The session ID.
          */
-        private fun generateSessionId(): Long {
+        private fun generateSessionId(context: VWOContext): Long {
+            if (context.sessionId != 0L) {
+                return context.sessionId / 1000
+            }
+
             return Calendar.getInstance().timeInMillis / 1000
         }
 
@@ -406,7 +435,10 @@ class NetworkUtil {
          * @param ipAddress The IP address of the user.
          * @return Map containing the headers.
          */
-        private fun createHeaders(userAgent: String?, ipAddress: String?): MutableMap<String, String> {
+        private fun createHeaders(
+            userAgent: String?,
+            ipAddress: String?
+        ): MutableMap<String, String> {
             val headers: MutableMap<String, String> = HashMap()
             if (!userAgent.isNullOrEmpty())
                 headers[HeadersEnum.USER_AGENT.header] = userAgent
diff --git a/fme-android/src/main/java/com/vwo/utils/RecommendationUtil.kt b/fme-android/src/main/java/com/vwo/utils/RecommendationUtil.kt
new file mode 100644
index 0000000..500e405
--- /dev/null
+++ b/fme-android/src/main/java/com/vwo/utils/RecommendationUtil.kt
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.utils
+
+import com.vwo.constants.Constants
+import com.vwo.constants.Constants.AUTH_TOKEN
+import com.vwo.enums.UrlEnum
+import com.vwo.packages.logger.enums.LogLevelEnum
+import com.vwo.packages.network_layer.manager.NetworkManager
+import com.vwo.packages.network_layer.models.RequestModel
+import com.vwo.services.LoggerService.Companion.log
+import com.vwo.services.SettingsManager.Companion.instance
+import org.json.JSONObject
+
+
+object RecommendationUtil {
+
+    var request :RequestModel?=null
+    /**
+     * This method is used to get recommendations based on the options passed.
+     * @param configId The configId for which recommendation is to be fetched
+     * @return The recommendations
+     */
+    fun getRecommendation(
+        configId: Int,
+        userId: String,
+        eventType: String,
+        category: String?,
+        productIds: List<Int>?
+    ): JSONObject {
+        try {
+            // set the query parameters
+            val queryParams: MutableMap<String, String> = HashMap()
+            queryParams["accountId"] = instance?.accountId.toString()
+
+            // create payload for the request
+            val array = ArrayList<Map<String, Any>>()
+            productIds?.forEach {
+                val productMap: MutableMap<String, Any> = HashMap()
+                productMap["id"] = it
+                array.add(productMap)
+            }
+
+            val payload: MutableMap<String, Any> = LinkedHashMap()
+            payload["configId"] = configId.toString()
+            payload["eventType"] = eventType
+            payload["products"] = array
+            payload["visitorId"] = userId
+            if (productIds != null && category != null) {
+                val variables: MutableMap<String, Any> = LinkedHashMap()
+                variables["product_id"] = productIds[0]
+                variables["category"] = category
+                payload["variables"] = variables
+            }
+
+            NetworkManager.attachClient()
+            val header = mutableMapOf("authToken" to AUTH_TOKEN)
+            val request = RequestModel(
+                Constants.VWO_APP_URL,
+                "POST",
+                UrlEnum.GENERATE_RECOMMENDATION.url,
+                queryParams,
+                payload,
+                header,
+                instance?.protocol,
+                0
+            )
+            val map = mapOf<String?, String?>(
+                "accountId" to instance?.accountId.toString(),
+                "userId" to userId
+            )
+            log(LogLevelEnum.DEBUG, "IMPRESSION_FOR_GET_RECOMMENDATION", map)
+            val responseModel = NetworkManager.post(request)
+            val jsonObject = if (responseModel?.statusCode == 200) {
+                JSONObject(responseModel.data?:"{}")
+            } else {
+                val map = mutableMapOf<String?, String?>()
+                map["err"]= responseModel?.error.toString()
+                log(LogLevelEnum.ERROR, "RECOMMENDATION_ERROR",map)
+                JSONObject()
+            }
+            return jsonObject
+        } catch (e: Exception) {
+            val map = mapOf<String?,String?>("err" to e.message)
+            log(LogLevelEnum.ERROR, "RECOMMENDATION_ERROR", map)
+            return JSONObject()
+        }
+    }
+}
diff --git a/fme-android/src/main/java/com/vwo/utils/RuleEvaluationUtil.kt b/fme-android/src/main/java/com/vwo/utils/RuleEvaluationUtil.kt
index f45fbdf..43b3d03 100644
--- a/fme-android/src/main/java/com/vwo/utils/RuleEvaluationUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/RuleEvaluationUtil.kt
@@ -49,7 +49,7 @@ object RuleEvaluationUtil {
         campaign: Campaign,
         context: VWOContext,
         evaluatedFeatureMap: MutableMap<String, Any>,
-        megGroupWinnerCampaigns: MutableMap<Int, Int>?,
+        megGroupWinnerCampaigns: MutableMap<Int, String>?,
         storageService: StorageService,
         decision: MutableMap<String, Any>
     ): Map<String, Any> {
diff --git a/fme-android/src/main/java/com/vwo/utils/SettingsUtil.kt b/fme-android/src/main/java/com/vwo/utils/SettingsUtil.kt
index 9e29eb2..dfeadbb 100644
--- a/fme-android/src/main/java/com/vwo/utils/SettingsUtil.kt
+++ b/fme-android/src/main/java/com/vwo/utils/SettingsUtil.kt
@@ -23,12 +23,7 @@ import com.vwo.models.Settings
 import com.vwo.models.Variation
 import com.vwo.packages.logger.enums.LogLevelEnum
 import com.vwo.services.LoggerService
-import java.util.Objects
-import java.util.function.Consumer
-import java.util.function.Function
-import java.util.function.Predicate
 import java.util.regex.Pattern
-import java.util.stream.Collectors
 
 /**
  * Utility object for settings-related operations.
@@ -37,6 +32,9 @@ import java.util.stream.Collectors
  * values, validating settings data, or performing other settings-related tasks.
  */
 object SettingsUtil {
+
+    var settingsFile: Settings? = Settings()
+
     /**
      * Processes the settings file and modifies it as required.
      * This method is called before the settings are used by the SDK.
@@ -57,6 +55,8 @@ object SettingsUtil {
             }
             addLinkedCampaignsToSettings(settings)
             addIsGatewayServiceRequiredFlag(settings)
+            addIsHistoricalEventDSL(settings)
+            settingsFile = settings
         } catch (exception: Exception) {
             LoggerService.log(
                 LogLevelEnum.ERROR,
@@ -143,6 +143,28 @@ object SettingsUtil {
         }
     }
 
+    private fun addIsHistoricalEventDSL(settings: Settings) {
+
+        val patternString = """\s*"cnds"\s*[:.]?\s*"""
+        val pattern = Pattern.compile(patternString)
+
+        for (feature in settings.features) {
+            val rules: List<Campaign> = feature.rulesLinkedCampaign
+            for (rule in rules) {
+                val segmentsEvents =
+                    if (rule.type == CampaignTypeEnum.ROLLOUT.value || rule.type == CampaignTypeEnum.PERSONALIZE.value) {
+                        rule.variations?.get(0)?.segments_events
+                    } else {
+                        rule.segments_events
+                    }
+
+                if (segmentsEvents != null) {
+                    rule.isEventsDsl = true
+                }
+            }
+        }
+    }
+
     /**
      * Checks if a given starting index is within a "custom_variable" block in a string.
      *
diff --git a/fme-android/src/main/java/com/vwo/utils/UUIDUtils.kt b/fme-android/src/main/java/com/vwo/utils/UUIDUtils.kt
index 8308656..34c3d91 100644
--- a/fme-android/src/main/java/com/vwo/utils/UUIDUtils.kt
+++ b/fme-android/src/main/java/com/vwo/utils/UUIDUtils.kt
@@ -15,26 +15,34 @@
  */
 package com.vwo.utils
 
+import com.google.common.hash.Hashing
+import java.nio.charset.StandardCharsets
 import java.util.Locale
 import java.util.UUID
 
-/**
- * Utility object for UUID (Universally Unique Identifier) operations.
- *
- * This object provides helper methods for generating and working with UUIDs.
- */
 object UUIDUtils {
+
+    // Define the DNS and URL namespaces for UUID v5
+    private val DNS_NAMESPACE = UUID.fromString("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
+    private val URL_NAMESPACE = UUID.fromString("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
+
+    // Define the SEED_URL constant
+    private const val SEED_URL = "https://vwo.com"
+
     /**
      * Generates a random UUID based on an API key.
-     * @param apiKey The API key used to generate a namespace for the UUID.
+     * @param sdkKey The API key used to generate a namespace for the UUID.
      * @return A random UUID string.
      */
-    fun getRandomUUID(apiKey: String): String {
+    fun getRandomUUID(sdkKey: String): String {
         // Generate a namespace based on the API key using DNS namespace
-        val namespace = UUID.nameUUIDFromBytes(apiKey.toByteArray())
-        // Generate a random UUID using the namespace derived from the API key
+        val namespace = generateUUID(sdkKey, DNS_NAMESPACE)
+        // Generate a random UUID (UUIDv4)
         val randomUUID = UUID.randomUUID()
-        return UUID(namespace.mostSignificantBits, randomUUID.leastSignificantBits).toString()
+        // Generate a UUIDv5 using the random UUID and the namespace
+        val uuidv5 = generateUUID(randomUUID.toString(), namespace)
+
+        return uuidv5.toString()
     }
 
     /**
@@ -44,11 +52,16 @@ object UUIDUtils {
      * @return A UUID string formatted without dashes and in uppercase.
      */
     fun getUUID(userId: String?, accountId: String?): String {
-        val VWO_NAMESPACE = UUID.nameUUIDFromBytes("https://vwo.com".toByteArray())
+        // Generate a namespace UUID based on SEED_URL using URL namespace
+        val VWO_NAMESPACE = generateUUID(SEED_URL, URL_NAMESPACE)
+        // Ensure userId and accountId are strings
+        val userIdStr = userId ?: ""
+        val accountIdStr = accountId ?: ""
         // Generate a namespace UUID based on the accountId
-        val userIdNamespace = generateUUID(accountId, VWO_NAMESPACE.toString())
+        val userIdNamespace = generateUUID(accountIdStr, VWO_NAMESPACE)
         // Generate a UUID based on the userId and the previously generated namespace
-        val uuidForUserIdAccountId = generateUUID(userId, userIdNamespace.toString())
+        val uuidForUserIdAccountId = generateUUID(userIdStr, userIdNamespace)
+
         // Remove all dashes from the UUID and convert it to uppercase
         val desiredUuid = uuidForUserIdAccountId.toString().replace("-".toRegex(), "").uppercase(
             Locale.getDefault()
@@ -60,14 +73,67 @@ object UUIDUtils {
      * Helper function to generate a UUID v5 based on a name and a namespace.
      * @param name The name from which to generate the UUID.
      * @param namespace The namespace used to generate the UUID.
-     * @return A UUID string or null if inputs are invalid.
+     * @return A UUID.
      */
-    private fun generateUUID(name: String?, namespace: String?): UUID? {
-        // Check for valid input to prevent errors
+    fun generateUUID(name: String?, namespace: UUID?): UUID? {
         if (name == null || namespace == null) {
             return null
         }
-        // Generate and return the UUID v5
-        return UUID.nameUUIDFromBytes(name.toByteArray())
+
+        val namespaceBytes = toBytes(namespace)
+        val nameBytes = name.toByteArray(StandardCharsets.UTF_8)
+        val combined = ByteArray(namespaceBytes.size + nameBytes.size)
+        System.arraycopy(namespaceBytes, 0, combined, 0, namespaceBytes.size)
+        System.arraycopy(nameBytes, 0, combined, namespaceBytes.size, nameBytes.size)
+
+        val hash = Hashing.sha1().hashBytes(combined).asBytes()
+
+        // Set version to 5 (name-based using SHA-1)
+        hash[6] = (hash[6].toInt() and 0x0f).toByte() // Clear version
+        hash[6] = (hash[6].toInt() or 0x50).toByte() // Set to version 5
+        hash[8] = (hash[8].toInt() and 0x3f).toByte() // Clear variant
+        hash[8] = (hash[8].toInt() or 0x80).toByte() // Set to IETF variant
+
+        return fromBytes(hash)
+    }
+
+    /**
+     * Helper function to convert a UUID to a byte array.
+     * @param uuid The UUID to convert.
+     * @return A byte array.
+     */
+    private fun toBytes(uuid: UUID): ByteArray {
+        val bytes = ByteArray(16)
+        val msb = uuid.mostSignificantBits
+        val lsb = uuid.leastSignificantBits
+
+        // Convert the most significant bits and least significant bits to bytes
+        for (i in 0..7) {
+            bytes[i] = (msb ushr (8 * (7 - i))).toByte()
+            bytes[8 + i] = (lsb ushr (8 * (7 - i))).toByte()
+        }
+
+        return bytes
+    }
+
+    /**
+     * Helper function to convert a byte array to a UUID.
+     * @param bytes The byte array to convert.
+     * @return A UUID.
+     */
+    private fun fromBytes(bytes: ByteArray): UUID {
+        var msb: Long = 0
+        var lsb: Long = 0
+
+        // Convert the most significant bits and least significant bits to longs
+        for (i in 0..7) {
+            msb = msb shl 8 or (bytes[i].toLong() and 0xff)
+        }
+
+        for (i in 8..15) {
+            lsb = lsb shl 8 or (bytes[i].toLong() and 0xff)
+        }
+
+        return UUID(msb, lsb)
     }
 }
diff --git a/fme-android/src/test/java/com/vwo/e2e/GetFlagTests.kt b/fme-android/src/test/java/com/vwo/e2e/GetFlagTests.kt
new file mode 100644
index 0000000..9b8140e
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/e2e/GetFlagTests.kt
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.e2e
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.VWOBuilder
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.interfaces.IVwoListener
+import com.vwo.models.user.GetFlag
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.testcases.TestData
+import com.vwo.testcases.TestDataReader
+import com.vwo.utils.DummySettingsReader
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.spy
+import org.mockito.kotlin.whenever
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+class GetFlagTests {
+    private val SDK_KEY: String = "abcd"
+    private val ACCOUNT_ID: Int = 1234
+    private lateinit var settingsReader: DummySettingsReader
+    private lateinit var vwo: VWO
+    private var vwoInitOptions = VWOInitOptions()
+    private val testCases = TestDataReader().testCases
+
+    @Before
+    fun setup() {
+    }
+
+    @Test
+    fun testGetFlagWithoutStorage() {
+        testCases?.getFlagWithoutStorage?.let { runTests(it) }
+    }
+
+    @Test
+    fun testGetFlagWithMegRandom() {
+        testCases?.getFlagMegRandom?.let { runTests(it) }
+    }
+
+    @Test
+    fun testGetFlagWithMegAdvance() {
+        testCases?.getFlagMegAdvance?.let { runTests(it) }
+    }
+
+    /*fun testGetFlagWithStorage() {
+        testCases?.getFlagWithStorage?.let { runTests(it) }
+    }*/
+
+    fun runTests(tests: List<TestData>) {
+
+        var featureFlag: GetFlag? = null
+        tests.forEach { testData ->
+            val vwoInitOptions = VWOInitOptions()
+            vwoInitOptions.sdkKey = SDK_KEY
+            vwoInitOptions.accountId = ACCOUNT_ID
+
+            settingsReader = DummySettingsReader()
+            val vwoBuilder = VWOBuilder(vwoInitOptions)
+            val vwoBuilderSpy: VWOBuilder = spy(vwoBuilder)
+            val settingsMap = settingsReader.settingsMap
+            val settings = settingsMap[testData.settings]
+            settings?.let {
+                whenever(vwoBuilderSpy.getSettings(false)).thenReturn(settings)
+            }
+            /*val result = vwoBuilderSpy.getSettings(false)
+            println("VWO - Mocked settings matching: ${result == settings}")*/
+            vwoInitOptions.vwoBuilder = vwoBuilderSpy
+
+            var latch = CountDownLatch(1)
+            init(vwoInitOptions, object : IVwoInitCallback {
+                override fun vwoInitSuccess(vwo: VWO, message: String) {
+                    this@GetFlagTests.vwo = vwo
+                    latch.countDown()
+                }
+
+                override fun vwoInitFailed(message: String) {
+                    println("VWO $message")
+                }
+            })
+
+            latch.await(10, TimeUnit.SECONDS)
+            if (!::vwo.isInitialized) return
+            latch = CountDownLatch(1)
+            vwo.getFlag(testData.featureKey!!, testData.context!!, object : IVwoListener {
+                override fun onSuccess(data: Any) {
+                    featureFlag = data as? GetFlag
+                    latch.countDown()
+                }
+
+                override fun onFailure(message: String) {
+                    println(message)
+                }
+            })
+
+            // Wait for onSuccess to be called
+            latch.await(5, TimeUnit.SECONDS)
+            val isFeatureFlagEnabled = featureFlag?.isEnabled()
+            assertEquals(testData.expectation?.isEnabled, isFeatureFlagEnabled)
+            val variable = featureFlag?.getVariable("int", 1)
+            assertEquals(
+                testData.expectation?.intVariable,
+                (variable as? Int) ?: (variable as? Double)?.toInt() ?: 1
+            )
+            assertEquals(
+                testData.expectation?.stringVariable,
+                featureFlag?.getVariable("string", "VWO")
+            )
+            assertEquals(
+                testData.expectation?.floatVariable,
+                featureFlag?.getVariable("float", 1.1)
+            )
+            assertEquals(
+                testData.expectation?.booleanVariable,
+                featureFlag?.getVariable("boolean", false)
+            )
+            assertEquals(
+                testData.expectation?.jsonVariable,
+                featureFlag?.getVariable("json", HashMap<Any, Any>())
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/AndOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/AndOperatorTests.kt
new file mode 100644
index 0000000..bd48a4a
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/AndOperatorTests.kt
@@ -0,0 +1,183 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+
+class AndOperatorTests {
+
+    private lateinit var vwo: VWO
+    private val SDK_KEY = "abcd"
+    private val ACCOUNT_ID = 1234
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = SDK_KEY
+        vwoInitOptions.accountId = ACCOUNT_ID
+        VWO.init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@AndOperatorTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun singleAndOperatorMatchingTest() {
+        val dsl = "{\"and\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleAndOperatorMismatchTest() {
+        val dsl = "{\"and\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("a", "n_eq_value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleAndOperatorCaseMismatchTest() {
+        val dsl = "{\"and\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Eq_Value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleAndOperatorTest2() {
+        val dsl =
+            "{\"and\":[{\"and\":[{\"and\":[{\"and\":[{\"and\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}]}]}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleAndOperatorWithSingleCorrectValueTest() {
+        val dsl =
+            "{\"and\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("reg", "wrong")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleAndOperatorWithSingleCorrectValueTest2() {
+        val dsl =
+            "{\"and\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "wrong")
+                put("reg", "myregexxxxxx")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleAndOperatorWithAllCorrectCustomVariablesTest() {
+        val dsl =
+            "{\"and\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("reg", "myregexxxxxx")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleAndOperatorWithAllIncorrectCorrectCustomVariablesTest() {
+        val dsl =
+            "{\"and\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "wrong")
+                put("reg", "wrong")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun sdhgsjdh() {
+        val dsl = "{\"or\":[{\"user\":\"Varun\"}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "wrong")
+                put("reg", "wrong")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    private fun verifyExpectation(dsl: String, customVariables: Map<String, Any>) {
+        SegmentationManager.attachEvaluator()
+        assertEquals(
+            SegmentationManager.validateSegmentation(dsl, customVariables),
+            customVariables["expectation"]
+        )
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/CaseInsensitiveEqualityOperandTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/CaseInsensitiveEqualityOperandTests.kt
new file mode 100644
index 0000000..0043980
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/CaseInsensitiveEqualityOperandTests.kt
@@ -0,0 +1,489 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager.attachEvaluator
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager.validateSegmentation
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+
+class CaseInsensitiveEqualityOperandTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@CaseInsensitiveEqualityOperandTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun exactMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpecialCharactersTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpacesTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(nice to see you. will    YOU be   my        Friend?)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "nice to see you. will    YOU be   my        Friend?")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithUpperCaseTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun caseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun caseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "SOMETHINg")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun trimValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(HI)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "          hi          ")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeExtraDecimalZerosTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456000000)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.0)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "123.456000000")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.0)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest3() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.4560000)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(E)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+
+    @Test
+    fun charDataTypeCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(E)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'e')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(e)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(true)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(false)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest3() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(True)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun mismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "notsomething")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun partOfTextTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(zzsomethingzz)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleCharTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(zzsomethingzz)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "i")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun noValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun missingkeyValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nullValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", null)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyCaseTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("EQ", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 12)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.4567)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(false)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lower(true)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    private fun verifyExpectation(dsl: String, customVariables: Map<String, Any>) {
+        attachEvaluator()
+        Assert.assertEquals(
+            validateSegmentation(dsl, customVariables),
+            customVariables["expectation"]
+        )
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/CombinationTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/CombinationTests.kt
new file mode 100644
index 0000000..36df85a
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/CombinationTests.kt
@@ -0,0 +1,679 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class CombinationTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@CombinationTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun dslWithAllOperandsTest() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"and\":[{\"or\":[{\"custom_variable\":{\"start_with\":\"wildcard(my_start_with_val*)\"}}]},{\"not\":{\"or\":[{\"custom_variable\":{\"neq\":\"not_eq_value\"}}]}}]},{\"or\":[{\"custom_variable\":{\"contain\":\"wildcard(*my_contain_val*)\"}}]}]},{\"and\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}]}"
+        val customVariables: Map<String, Map<String, Any>> =
+            object : HashMap<String, Map<String, Any>>() {
+                init {
+                    put("matchingStartWithValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "my_start_with_valzzzzzzzzzzzzzzzz")
+                            put("neq", 1)
+                            put("contain", 1)
+                            put("eq", 1)
+                            put("reg", 1)
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("matchingNotEqualToValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", 1)
+                            put("neq", "not_eq_value")
+                            put("contain", 1)
+                            put("eq", 1)
+                            put("reg", 1)
+                            put("expectation", false)
+                        }
+                    })
+
+                    put(
+                        "matchingBothStartWithAndNotEqualToValue",
+                        object : HashMap<String, Any>() {
+                            init {
+                                put("start_with", "my_start_with_valzzzzzzzzzzzzzzzz")
+                                put("neq", "not_eq_value")
+                                put("contain", 1)
+                                put("eq", 1)
+                                put("reg", 1)
+                                put("expectation", false)
+                            }
+                        })
+
+                    put("matchingContainsWithValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            put("neq", false)
+                            put("contain", "zzzzzzmy_contain_valzzzzz")
+                            put("eq", 1)
+                            put("reg", 1)
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("matchingEqualToValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            //put("neq", null)
+                            put("contain", "my_ contain _val")
+                            put("eq", "eq_value")
+                            put("reg", 1)
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("matchingRegexValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            put("neq", 123)
+                            put("contain", "my_ contain _val")
+                            put("eq", "eq__value")
+                            put("reg", "myregexxxxxx")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("matchingBothEqualToAndRegexValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            put("neq", "not_matching")
+                            put("contain", "my\$contain\$val")
+                            put("eq", "eq_value")
+                            put("reg", "myregexxxxxx")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put(
+                        "matching_both_start_with_and_not_equal_to_value",
+                        object : HashMap<String, Any>() {
+                            init {
+                                put("start_with", "my_start_with_valzzzzzzzzzzzzzzzz")
+                                put("neq", "not_eq_value")
+                                put("contain", 1)
+                                put("eq", 1)
+                                put("reg", 1)
+                                put("expectation", false)
+                            }
+                        })
+
+                    put("matching_not_equal_to_value", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", 1)
+                            put("neq", "not_eq_value")
+                            put("contain", 1)
+                            put("eq", 1)
+                            put("reg", 1)
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("matching_start_with_value", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "my_start_with_valzzzzzzzzzzzzzzzz")
+                            put("neq", 1)
+                            put("contain", 1)
+                            put("eq", 1)
+                            put("reg", 1)
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("matching_regex_value", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            put("neq", 123)
+                            put("contain", "my_ contain _val")
+                            put("eq", "eq__value")
+                            put("reg", "myregexxxxxx")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put(
+                        "matching_both_equal_to_and_regex_value",
+                        object : HashMap<String, Any>() {
+                            init {
+                                put("start_with", "m1y_1sta1rt_with_val")
+                                put("neq", "not_matching")
+                                put("contain", "my\$contain\$val")
+                                put("eq", "eq_value")
+                                put("reg", "myregexxxxxx")
+                                put("expectation", true)
+                            }
+                        })
+
+                    put("matching_equal_to_value", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            //put("neq", null)
+                            put("contain", "my_ contain _val")
+                            put("eq", "eq_value")
+                            put("reg", 1)
+                            put("expectation", false)
+                        }
+                    })
+                }
+            }
+
+        validateAllCases(dsl, customVariables)
+    }
+
+    @Test
+    fun emptyDslTest() {
+        val dsl = "{}"
+        val customVariables: Map<String, Map<String, Any>> =
+            object : HashMap<String, Map<String, Any>>() {
+                init {
+                    put("matchingStartWithValue", object : HashMap<String, Any>() {
+                        init {
+                            put("start_with", "m1y_1sta1rt_with_val")
+                            //put("neq", null)
+                            put("contain", "my_ contain _val")
+                            put("eq", "eq_value")
+                            put("reg", 1)
+                            put("expectation", false)
+                        }
+                    })
+                }
+            }
+
+        validateAllCases(dsl, customVariables)
+    }
+
+    @Test
+    fun dslWithAllOperandsTest2() {
+        val dsl =
+            "{\"or\":[{\"and\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"notvwo\":\"notvwo\"}}]}},{\"or\":[{\"custom_variable\":{\"vwovwovwo\":\"regex(vwovwovwo)\"}}]}]},{\"or\":[{\"custom_variable\":{\"regex_vwo\":\"regex(this\\\\s+is\\\\s+vwo)\"}}]}]},{\"and\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"vwo_not_equal_to\":\"owv\"}}]}},{\"or\":[{\"custom_variable\":{\"vwo_equal_to\":\"vwo\"}}]}]},{\"or\":[{\"or\":[{\"custom_variable\":{\"vwo_starts_with\":\"wildcard(owv vwo*)\"}}]},{\"or\":[{\"custom_variable\":{\"vwo_contains\":\"wildcard(*vwo vwo vwo vwo vwo*)\"}}]}]}]}]}"
+        val customVariables: Map<String, Map<String, Any>> =
+            object : HashMap<String, Map<String, Any>>() {
+                init {
+                    put("false_1", object : HashMap<String, Any>() {
+                        init {
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwo_contains", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "v owv vwo")
+                            put("vwovwovwo", "vwovovwo")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_2", object : HashMap<String, Any>() {
+                        init {
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwo_contains", "vwo")
+                            put("vwo_equal_to", "vwovwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwovwovwo", "vwovw")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_3", object : HashMap<String, Any>() {
+                        init {
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwo_contains", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "vwo owv vwo")
+                            put("vwovwovwo", "vwovwovw")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_4", object : HashMap<String, Any>() {
+                        init {
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwo_contains", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "vwo owv vwo")
+                            put("vwovwovwo", "vwo")
+                            put("expectation", false)
+                        }
+                    })
+                }
+            }
+
+        validateAllCases(dsl, customVariables)
+    }
+
+    @Test
+    fun dslWithAllOperandsTest3() {
+        val dsl =
+            "{\"or\":[{\"and\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"notvwo\":\"notvwo\"}}]}},{\"or\":[{\"custom_variable\":{\"vwovwovwo\":\"regex(vwovwovwo)\"}}]}]},{\"or\":[{\"custom_variable\":{\"regex_vwo\":\"regex(this\\\\s+is\\\\s+vwo)\"}}]}]},{\"and\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"vwo_not_equal_to\":\"owv\"}}]}},{\"or\":[{\"custom_variable\":{\"vwo_equal_to\":\"vwo\"}}]}]},{\"or\":[{\"or\":[{\"custom_variable\":{\"vwo_starts_with\":\"wildcard(owv vwo*)\"}}]},{\"or\":[{\"custom_variable\":{\"vwo_contains\":\"wildcard(*vwo vwo vwo vwo vwo*)\"}}]}]}]}]}"
+        val customVariables: Map<String, Map<String, Any>> =
+            object : HashMap<String, Map<String, Any>>() {
+                init {
+                    put("true_1", object : HashMap<String, Any>() {
+                        init {
+                            put("vwo_starts_with", "vwo owv vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("notvwo", "vo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("vwo_contains", "vw")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_2", object : HashMap<String, Any>() {
+                        init {
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("vwo_contains", "vwo")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_3", object : HashMap<String, Any>() {
+                        init {
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("notvwo", "vwovwo")
+                            put("regex_vwo", "this   isvwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("vwo_contains", "vwo")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_4", object : HashMap<String, Any>() {
+                        init {
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("vwovwovwo", "vwo")
+                            put("vwo_contains", "vwo")
+                            put("expectation", true)
+                        }
+                    })
+                }
+            }
+
+        validateAllCases(dsl, customVariables)
+    }
+
+    @Test
+    fun dslWithAllOperandsTest4() {
+        val dsl =
+            "{\"and\":[{\"or\":[{\"custom_variable\":{\"contains_vwo\":\"wildcard(*vwo*)\"}}]},{\"and\":[{\"and\":[{\"or\":[{\"and\":[{\"or\":[{\"and\":[{\"or\":[{\"custom_variable\":{\"regex_for_all_letters\":\"regex(^[A-z]+$)\"}}]},{\"or\":[{\"custom_variable\":{\"regex_for_capital_letters\":\"regex(^[A-Z]+$)\"}}]}]},{\"or\":[{\"custom_variable\":{\"regex_for_small_letters\":\"regex(^[a-z]+$)\"}}]}]},{\"or\":[{\"custom_variable\":{\"regex_for_no_zeros\":\"regex(^[1-9]+$)\"}}]}]},{\"or\":[{\"custom_variable\":{\"regex_for_zeros\":\"regex(^[0]+$)\"}}]}]},{\"or\":[{\"custom_variable\":{\"regex_real_number\":\"regex(^\\\\d+(\\\\.\\\\d+)?)\"}}]}]},{\"or\":[{\"or\":[{\"custom_variable\":{\"this_is_regex\":\"regex(this\\\\s+is\\\\s+text)\"}}]},{\"and\":[{\"and\":[{\"or\":[{\"custom_variable\":{\"starts_with\":\"wildcard(starts_with_variable*)\"}}]},{\"or\":[{\"custom_variable\":{\"contains\":\"wildcard(*contains_variable*)\"}}]}]},{\"or\":[{\"not\":{\"or\":[{\"custom_variable\":{\"is_not_equal_to\":\"is_not_equal_to_variable\"}}]}},{\"or\":[{\"custom_variable\":{\"is_equal_to\":\"equal_to_variable\"}}]}]}]}]}]}]}"
+        val customVariables: Map<String, Map<String, Any>> =
+            object : HashMap<String, Map<String, Any>>() {
+                init {
+                    put("false_5", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF6")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 12231023)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", "0001000")
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_6", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "is_not_equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 1223123)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_7", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF6")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 12231023)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "startss_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_8", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "wingify")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 1223123)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_9", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 1223123)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", "not a number")
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_10", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 1223123)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "_variable")
+                            put("this_is_regex", "thisis    regex")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("true_5", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 1223123)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_6", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 1223123)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 1234)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_7", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF6")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 12231023)
+                            put("regex_for_small_letters", "sadfAksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_8", object : HashMap<String, Any>() {
+                        init {
+                            put("contains", "contains_variable")
+                            put("contains_vwo", "legends say that vwo is the best")
+                            put("is_equal_to", "equal_to_variable")
+                            put("is_not_equal_to", "is_not_equal_to_variable")
+                            put("regex_for_all_letters", "dsfASF6")
+                            put("regex_for_capital_letters", "SADFLSDLF")
+                            put("regex_for_no_zeros", 12231023)
+                            put("regex_for_small_letters", "sadfksjdf")
+                            put("regex_for_zeros", 0)
+                            put("regex_real_number", 12321.2242)
+                            put("starts_with", "starts_with_variable")
+                            put("this_is_regex", "this    is    regex")
+                            put("expectation", true)
+                        }
+                    })
+                }
+            }
+
+        validateAllCases(dsl, customVariables)
+    }
+
+    @Test
+    fun dslWithAllOperandsTest5() {
+        val dsl =
+            "{\"and\":[{\"or\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"thanos\":\"snap\"}}]}},{\"or\":[{\"custom_variable\":{\"batman\":\"wildcard(*i am batman*)\"}}]}]},{\"or\":[{\"custom_variable\":{\"joker\":\"regex((joker)+)\"}}]}]},{\"and\":[{\"or\":[{\"or\":[{\"custom_variable\":{\"lol\":\"lolololololol\"}}]},{\"or\":[{\"custom_variable\":{\"blablabla\":\"wildcard(*bla*)\"}}]}]},{\"and\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"notvwo\":\"notvwo\"}}]}},{\"or\":[{\"and\":[{\"or\":[{\"custom_variable\":{\"vwovwovwo\":\"regex(vwovwovwo)\"}}]},{\"or\":[{\"custom_variable\":{\"regex_vwo\":\"regex(this\\\\s+is\\\\s+vwo)\"}}]}]},{\"or\":[{\"and\":[{\"not\":{\"or\":[{\"custom_variable\":{\"vwo_not_equal_to\":\"owv\"}}]}},{\"or\":[{\"custom_variable\":{\"vwo_equal_to\":\"vwo\"}}]}]},{\"or\":[{\"custom_variable\":{\"vwo_starts_with\":\"wildcard(owv vwo*)\"}}]}]}]}]},{\"or\":[{\"custom_variable\":{\"vwo_contains\":\"wildcard(*vwo vwo vwo vwo vwo*)\"}}]}]}]}]}"
+        val customVariables: Map<String, Map<String, Any>> =
+            object : HashMap<String, Map<String, Any>>() {
+                init {
+                    put("false_11", object : HashMap<String, Any>() {
+                        init {
+                            put("batman", "hello i am batman world")
+                            put("blablabla", "lba")
+                            put("joker", "joker joker joker")
+                            put("lol", "lollolololol")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("thanos", "snap")
+                            put("vwo_contains", "vwo vwo vwo vwo vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_12", object : HashMap<String, Any>() {
+                        init {
+                            put("batman", "hello i am batman world")
+                            put("blablabla", "bla bla bla")
+                            put("joker", "joker joker joker")
+                            put("lol", "lolololololol")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("thanos", "half universe")
+                            put("vwo_contains", "vwo vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("false_13", object : HashMap<String, Any>() {
+                        init {
+                            put("batman", "hello i am batman world")
+                            put("blablabla", "bla bla bla")
+                            put("joker", "joker joker joker")
+                            put("lol", "lollolololol")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("thanos", "snap")
+                            put("vwo_contains", "vwo vwo vwo vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("expectation", false)
+                        }
+                    })
+
+                    put("true_9", object : HashMap<String, Any>() {
+                        init {
+                            put("batman", "hello i am batman world")
+                            put("blablabla", "bla bla bla")
+                            put("joker", "joker joker joker")
+                            put("lol", "lollolololol")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("thanos", "half universe")
+                            put("vwo_contains", "vwo vwo vwo vwo vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_10", object : HashMap<String, Any>() {
+                        init {
+                            put("batman", "hello i am batman world")
+                            put("blablabla", "bla bla bla")
+                            put("joker", "joker joker joker")
+                            put("lol", "lolololololol")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("thanos", "half universe")
+                            put("vwo_contains", "vwo vwo vwo vwo vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("expectation", true)
+                        }
+                    })
+
+                    put("true_11", object : HashMap<String, Any>() {
+                        init {
+                            put("batman", "hello i am batman world")
+                            put("blablabla", "bla bla bla")
+                            put("joker", "joker joker joker")
+                            put("lol", "lolololololol")
+                            put("notvwo", "vwo")
+                            put("regex_vwo", "this   is vwo")
+                            put("thanos", "snap")
+                            put("vwo_contains", "vwo vwo vwo vwo vwo")
+                            put("vwo_equal_to", "vwo")
+                            put("vwo_not_equal_to", "vwo")
+                            put("vwo_starts_with", "owv vwo")
+                            put("vwovwovwo", "vwovwovwo")
+                            put("expectation", false) // TODO FIX to true
+                        }
+                    })
+                }
+            }
+
+        validateAllCases(dsl, customVariables)
+    }
+
+    private fun validateAllCases(dsl: String, customVariables: Map<String, Map<String, Any>>) {
+        SegmentationManager.attachEvaluator()
+        for ((_, value) in customVariables) {
+            val isPresegmentValid: Boolean =
+                SegmentationManager.validateSegmentation(dsl, value)
+            assertEquals(isPresegmentValid, value["expectation"])
+        }
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/ContainsOperandTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/ContainsOperandTests.kt
new file mode 100644
index 0000000..cabdfaa
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/ContainsOperandTests.kt
@@ -0,0 +1,457 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class ContainsOperandTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@ContainsOperandTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun exactMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun suffixMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "asdn3kn42knsdsomething")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun prefixMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "somethingdfgdwerewew")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun containsMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "asdn3kn42knsdsomethingjsbdj")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun specialCharactersTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put(
+                    "eq",
+                    "A-N-Y-T-H-I-N-G---f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!----A-N-Y-T-H-I-N-G"
+                )
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun containsOperandFalsyTestWithSpecialCharacter() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"a\":\"wildcard(*some*thing*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("a", "hellosomethingworld")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun spacesTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*nice to see you. will    you be   my        friend?*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put(
+                    "eq",
+                    "Hello there!! nice to see you. will    you be   my        friend? Yes, Great!!"
+                )
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun upperCaseTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put(
+                    "eq",
+                    "A-N-Y-T-H-I-N-G---HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH----A-N-Y-T-H-I-N-G"
+                )
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 365412363)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 765123.4567364)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 765123.7364)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "87654123.4567902")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*E*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*true*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*false*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun mismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "qwertyu")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun partOfTextTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*zzsomethingzz*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleCharTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*zzsomethingzz*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "i")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "SOMETHING")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun noValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun missingkeyValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nullValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", null)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyCaseTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("EQ", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 12)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*false*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*true*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*E*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'e')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*e*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    private fun verifyExpectation(dsl: String, customVariables: Map<String, Any>) {
+        SegmentationManager.attachEvaluator()
+        assertEquals(
+            SegmentationManager.validateSegmentation(dsl, customVariables),
+            customVariables["expectation"]
+        )
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/EndsWithOperandTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/EndsWithOperandTests.kt
new file mode 100644
index 0000000..be94b64
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/EndsWithOperandTests.kt
@@ -0,0 +1,501 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class EndsWithOperandTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@EndsWithOperandTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun exactMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun suffixMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "asdn3kn42knsdsomething")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun prefixMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "somethingdfgdwerewew")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun containsMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "asdn3kn42knsdsomethingmm")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun specialCharactersTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "A-N-Y-T-H-I-N-G---f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun spacesTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*nice to see you. will    you be   my        friend?)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Hello there!! nice to see you. will    you be   my        friend?")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun upperCaseTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "A-N-Y-T-H-I-N-G---HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 3654123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 765123.456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeExtraDecimalZerosTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 765123.456000000)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 765123.0)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "87654123.456000000")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.0)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 7657123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest3() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.4560000)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 98765123.456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*E)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*true)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*false)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun mismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "qwertyu")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun partOfTextTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*zzsomethingzz)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleCharTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*zzsomethingzz)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "i")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "SOMETHING")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun noValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun missingkeyValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nullValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", null)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyCaseTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*something)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("EQ", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 12)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*123.456)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.4567)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*false)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*true)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*E)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'e')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(*e)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+
+    private fun verifyExpectation(dsl: String, customVariables: Map<String, Any>) {
+        SegmentationManager.attachEvaluator()
+        assertEquals(
+            SegmentationManager.validateSegmentation(dsl, customVariables),
+            customVariables["expectation"]
+        )
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/EqualityOperandTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/EqualityOperandTests.kt
new file mode 100644
index 0000000..c893a4c
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/EqualityOperandTests.kt
@@ -0,0 +1,488 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+
+class EqualityOperandTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@EqualityOperandTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun exactMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpecialCharactersTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpacesTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"nice to see you. will    you be   my        friend?\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "nice to see you. will    you be   my        friend?")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpacesTest1() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"   nice to see you. will    you be   my        friend?   \"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "nice to see you. will you be my friend?")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithUpperCaseTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun trimValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"  hi  \"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "          hi          ")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeExtraDecimalZerosTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456000000)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.0)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "123.456000000")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.0\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest3() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.4560000\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"E\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E') // Char in JAVA
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"true\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"false\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun mismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "notsomething")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun partOfTextTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"zzsomethingzz\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleCharTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"zzsomethingzz\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "i")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun caseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun caseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "SOMETHING")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun noValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun missingkeyValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nullValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", null)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyCaseTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("EQ", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 12)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.4567)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"false\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"true\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"E\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'e')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"e\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    private fun verifyExpectation(dsl: String, customVariables: Map<String, Any>) {
+        SegmentationManager.attachEvaluator()
+        assertEquals(
+            SegmentationManager.validateSegmentation(dsl, customVariables),
+            customVariables["expectation"]
+        )
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanEqualToOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanEqualToOperatorTests.kt
new file mode 100644
index 0000000..fcc6410
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanEqualToOperatorTests.kt
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class GreaterThanEqualToOperatorTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@GreaterThanEqualToOperatorTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun greaterThanEqualToOperatorPass() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 160)
+                put("expectation", true)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun greaterThanEqualToOperatorEqualValuePass() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 150)
+                put("expectation", true)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun greaterThanEqualToOperatorFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 100)
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun greaterThanEqualToOperatorStringValueFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "abc")
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanOperatorTests.kt
new file mode 100644
index 0000000..5a0dcaa
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/GreaterThanOperatorTests.kt
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class GreaterThanOperatorTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@GreaterThanOperatorTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun greaterThanOperatorPass() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 160)
+                put("expectation", true)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun greaterThanOperatorFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 100)
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun greaterThanOperatorEqualValueFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 150)
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun greaterThanOperatorStringValueFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"gt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "abc")
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/LessThanEqualToOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/LessThanEqualToOperatorTests.kt
new file mode 100644
index 0000000..b773cb2
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/LessThanEqualToOperatorTests.kt
@@ -0,0 +1,75 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class LessThanEqualToOperatorTests {
+    @Test
+    fun LessThanEqualToOperatorPass() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 100)
+                put("expectation", true)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun LessThanEqualToOperatorEqualValuePass() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 150)
+                put("expectation", true)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun LessThanEqualToOperatorFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 200)
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+
+    @Test
+    fun LessThanEqualToOperatorStringValueFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lte(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "abc")
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
\ No newline at end of file
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/LessThanOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/LessThanOperatorTests.kt
new file mode 100644
index 0000000..1cec757
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/LessThanOperatorTests.kt
@@ -0,0 +1,94 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class LessThanOperatorTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@LessThanOperatorTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun LessThanOperatorPass() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 100)
+                put("expectation", true)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun LessThanOperatorFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 200)
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun LessThanOperatorEqualValueFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 150)
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun LessThanOperatorStringValueFail() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"lt(150)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "abc")
+                put("expectation", false)
+            }
+        }
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/NotOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/NotOperatorTests.kt
new file mode 100644
index 0000000..7157fff
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/NotOperatorTests.kt
@@ -0,0 +1,563 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class NotOperatorTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@NotOperatorTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun exactMatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpecialCharactersTest() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithSpacesTest() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"nice to see you. will    you be   my        friend?\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "nice to see you. will    you be   my        friend?")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun exactMatchWithUpperCaseTest() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeExtraDecimalZerosTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456000000)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.0)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "123.456000000")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.0\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest3() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.4560000\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"E\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E') // Char in JAVA
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"true\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"false\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun mismatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "notsomething")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun partOfTextTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"zzsomethingzz\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleCharTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"zzsomethingzz\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "i")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "SOMETHING")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun noValueProvidedTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun missingkeyValueTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nullValueProvidedTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", null)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyCaseTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"something\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("EQ", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 12)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"123.456\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.4567)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"false\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"true\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"E\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'e')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest2() {
+        val dsl = "{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"e\"}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nestedNotOperatorTest() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"not\":{\"or\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}]}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest() {
+        val dsl =
+            "{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}}]}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest2() {
+        val dsl =
+            "{\"and\":[{\"and\":[{\"not\":{\"and\":[{\"and\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}]}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest3() {
+        val dsl =
+            "{\"and\":[{\"not\":{\"and\":[{\"not\":{\"and\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}}]}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest4() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"custom_variable\":{\"neq\":\"eq_value\"}}]}}]}}]}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest5() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"custom_variable\":{\"neq\":\"not_eq_value\"}}]}}]}}]}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "eq_value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest6() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"custom_variable\":{\"neq\":\"eq_value\"}}]}}]}}]}}]}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "eq_value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleNotOperatorTest7() {
+        val dsl =
+            "{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"not\":{\"or\":[{\"custom_variable\":{\"neq\":\"neq_value\"}}]}}]}}]}}]}}]}}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/OrOperatorTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/OrOperatorTests.kt
new file mode 100644
index 0000000..a3eca24
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/OrOperatorTests.kt
@@ -0,0 +1,159 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class OrOperatorTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@OrOperatorTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun singleOrOperatorMatchingTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleOrOperatorMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("a", "n_eq_value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleOrOperatorCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Eq_Value")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleOrOperatorTest() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"or\":[{\"or\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]}]}]}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleOrOperatorWithSingleCorrectValueTest() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("reg", "wrong")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleOrOperatorWithSingleCorrectValueTest2() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "wrong")
+                put("reg", "myregexxxxxx")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleOrOperatorWithAllCorrectCustomVariablesTest() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "eq_value")
+                put("reg", "myregeXxxxxx")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun multipleOrOperatorWithAllIncorrectCorrectCustomVariablesTest() {
+        val dsl =
+            "{\"or\":[{\"or\":[{\"custom_variable\":{\"eq\":\"eq_value\"}}]},{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "wrong")
+                put("reg", "wrong")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/RegexTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/RegexTests.kt
new file mode 100644
index 0000000..30498b2
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/RegexTests.kt
@@ -0,0 +1,124 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class RegexTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@RegexTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun regexOperandTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("reg", "myregexxxxxx")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun regexOperandTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"reg\":\"regex(<(W[^>]*)(.*?)>)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("reg", "<WingifySDK id=1></WingifySDK>")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun regexOperandMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"reg\":\"regex(<(W[^>]*)(.*?)>)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("reg", "<wingifySDK id=1></wingifySDK>")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun regexOperandCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"reg\":\"regex(myregex+)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("reg", "myregeXxxxxx")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun invalidReqexTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"reg\":\"regex(*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("reg", "*")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun invalidReqexTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"reg\":\"regex(*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("reg", "asdf")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/SegmentorTestUtils.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/SegmentorTestUtils.kt
new file mode 100644
index 0000000..2a3fe6f
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/SegmentorTestUtils.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2024 Wingify Software Pvt. Ltd.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package com.vwo.packages.segmentor
+
+import com.vwo.packages.segmentation_evaluator.core.SegmentationManager
+import org.junit.Assert.assertEquals
+
+fun verifyExpectation(dsl: String, customVariables: Map<String, Any>) {
+    SegmentationManager.attachEvaluator()
+    assertEquals(
+        SegmentationManager.validateSegmentation(dsl, customVariables),
+        customVariables["expectation"]
+    )
+}
\ No newline at end of file
diff --git a/fme-android/src/test/java/com/vwo/packages/segmentor/StartsWithOperandTests.kt b/fme-android/src/test/java/com/vwo/packages/segmentor/StartsWithOperandTests.kt
new file mode 100644
index 0000000..986c8c8
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/packages/segmentor/StartsWithOperandTests.kt
@@ -0,0 +1,451 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.packages.segmentor
+
+import com.vwo.VWO
+import com.vwo.VWO.init
+import com.vwo.interfaces.IVwoInitCallback
+import com.vwo.models.user.VWOInitOptions
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import org.junit.Before
+import org.junit.Test
+
+class StartsWithOperandTests {
+
+    private val sdkKey = "abcd"
+    private val accountId = 1234
+    private lateinit var vwo: VWO
+
+    @Before
+    fun initialize() {
+        val vwoInitOptions = VWOInitOptions()
+        vwoInitOptions.sdkKey = sdkKey
+        vwoInitOptions.accountId = accountId
+        init(vwoInitOptions, object : IVwoInitCallback {
+            override fun vwoInitSuccess(vwo: VWO, message: String) {
+                this@StartsWithOperandTests.vwo = vwo
+            }
+
+            override fun vwoInitFailed(message: String) {
+            }
+        })
+    }
+
+    @Test
+    fun exactMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun prefixMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "somethingdfgdwerewew")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun suffixMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "asdsdsdsomething")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun containsMatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "asdn3kn42knsdsomethingmm")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun specialCharactersTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "f25u!v@b#k$6%9^f&o*v(m)w_-=+s,./`(*&^%$#@!---A-N-Y-T-H-I-N-G---")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun spacesTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(nice to see you. will    you be   my        friend?*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "nice to see you. will    you be   my        friend? Great!!")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun upperCaseTest() {
+        val dsl =
+            "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "HgUvshFRjsbTnvsdiUFFTGHFHGvDRT.YGHGH---A-N-Y-T-H-I-N-G---")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123456)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.45)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123.456*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.456789)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123.0)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun stringifiedFloatTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123.456*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "123.456789")
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(E*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(true*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(false*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", true)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun mismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "qwertyu")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun partOfTextTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(zzsomethingzz*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun singleCharTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(zzsomethingzz*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "i")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "Something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun CaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "SOMETHING")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun noValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", "")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun missingkeyValueTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun nullValueProvidedTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", null)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("neq", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun incorrectKeyCaseTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(something*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("EQ", "something")
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun numericDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 12)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun floatDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(123.456*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 123)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(false*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", true)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun booleanDataTypeMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(true*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", false)
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(E*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'e')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+
+    @Test
+    fun charDataTypeCaseMismatchTest2() {
+        val dsl = "{\"or\":[{\"custom_variable\":{\"eq\":\"wildcard(e*)\"}}]}"
+        val customVariables: Map<String?, Any?> = object : HashMap<String?, Any?>() {
+            init {
+                put("eq", 'E')
+                put("expectation", false)
+            }
+        }
+
+        verifyExpectation(dsl, removeNullValues(customVariables))
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/testcases/Expectation.kt b/fme-android/src/test/java/com/vwo/testcases/Expectation.kt
new file mode 100644
index 0000000..5442b86
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/testcases/Expectation.kt
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.testcases
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.vwo.models.Storage
+
+class Expectation {
+    @JsonProperty("isEnabled")
+    var isEnabled: Boolean? = null
+    @JsonProperty("intVariable")
+    var intVariable: Int? = null
+    @JsonProperty("stringVariable")
+    var stringVariable: String? = null
+    @JsonProperty("floatVariable")
+    var floatVariable: Double? = null
+    @JsonProperty("booleanVariable")
+    var booleanVariable: Boolean? = null
+    @JsonProperty("jsonVariable")
+    var jsonVariable: Map<String, Any>? = null
+    @JsonProperty("storageData")
+    var storageData: Storage? = null
+}
diff --git a/fme-android/src/test/java/com/vwo/testcases/TestCases.kt b/fme-android/src/test/java/com/vwo/testcases/TestCases.kt
new file mode 100644
index 0000000..37d772f
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/testcases/TestCases.kt
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.testcases
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+class TestCases {
+    @JsonProperty("GETFLAG_WITHOUT_STORAGE")
+    var getFlagWithoutStorage: List<TestData>? = null
+
+    @JsonProperty("GETFLAG_MEG_RANDOM")
+    var getFlagMegRandom: List<TestData>? = null
+
+    @JsonProperty("GETFLAG_MEG_ADVANCE")
+    var getFlagMegAdvance: List<TestData>? = null
+
+    @JsonProperty("GETFLAG_WITH_STORAGE")
+    var getFlagWithStorage: List<TestData>? = null
+}
diff --git a/fme-android/src/test/java/com/vwo/testcases/TestData.kt b/fme-android/src/test/java/com/vwo/testcases/TestData.kt
new file mode 100644
index 0000000..df75122
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/testcases/TestData.kt
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.testcases
+
+import com.vwo.models.user.VWOContext
+
+class TestData {
+    var description: String? = null
+    var settings: String? = null
+    var context: VWOContext? = null
+    var expectation: Expectation? = null
+    var featureKey: String? = null
+}
diff --git a/fme-android/src/test/java/com/vwo/testcases/TestDataReader.kt b/fme-android/src/test/java/com/vwo/testcases/TestDataReader.kt
new file mode 100644
index 0000000..a4a3da3
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/testcases/TestDataReader.kt
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.testcases
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.vwo.VWOClient
+import com.vwo.utils.NetworkUtil.Companion.removeNullValues
+import java.nio.file.Files
+import java.nio.file.Paths
+
+class TestDataReader {
+    var testCases = readTestCases("index.json")
+
+    private var objectMapper: ObjectMapper? = null
+
+    /**
+     * Reads the test cases from a JSON file located in the specified folder.
+     * The JSON file must be named "index.json".
+     *
+     * @param folderPath The path to the folder containing the "index.json" file.
+     * @return An instance of TestCases containing the data from the JSON file, or null if the file does not exist.
+     */
+    private fun readTestCases(folderPath: String): TestCases? {
+        objectMapper = object : ObjectMapper() {
+            init {
+                configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+            }
+        }
+        val content = readFile(folderPath)
+        return content
+    }
+
+    /**
+     * Reads the log files and returns the messages in a map.
+     */
+    private fun readFile(fileName: String): TestCases? {
+        try {
+            val inputStream = this.javaClass.classLoader?.getResourceAsStream(fileName)
+            val contents = inputStream?.bufferedReader().use { it?.readText() }
+            val values = objectMapper?.readValue(contents, TestCases::class.java)
+            return values
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
+
+        return null
+    }
+}
diff --git a/fme-android/src/test/java/com/vwo/utils/DummySettingsReader.kt b/fme-android/src/test/java/com/vwo/utils/DummySettingsReader.kt
new file mode 100644
index 0000000..323d1df
--- /dev/null
+++ b/fme-android/src/test/java/com/vwo/utils/DummySettingsReader.kt
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2024 Wingify Software Pvt. Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.vwo.utils
+
+class DummySettingsReader {
+    var settingsMap: MutableMap<String, String> = mutableMapOf()
+
+    val fileNames = listOf(
+        "BASIC_ROLLOUT_TESTING_RULE_SETTINGS",
+        "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+        "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+        "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+        "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+        "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+        "BASIC_ROLLOUT_SETTINGS"
+    )
+
+    /**
+     * Constructor for DummySettingsReader.
+     * Initializes the settingsMap by reading JSON files from a specified directory.
+     */
+    init {
+        for (file in fileNames) {
+            val fileName = "$file.json"
+            readFile(fileName)?.let { settingsMap.put(file, it) }
+        }
+    }
+
+    /**
+     * Reads the log files and returns the messages in a map.
+     */
+    private fun readFile(fileName: String): String? {
+        try {
+            val inputStream = this.javaClass.classLoader?.getResourceAsStream(fileName)
+            val contents = inputStream?.bufferedReader().use { it?.readText() }
+            return contents
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
+
+        return null
+    }
+}
diff --git a/fme-android/src/test/resources/BASIC_ROLLOUT_SETTINGS.json b/fme-android/src/test/resources/BASIC_ROLLOUT_SETTINGS.json
new file mode 100644
index 0000000..5753fd9
--- /dev/null
+++ b/fme-android/src/test/resources/BASIC_ROLLOUT_SETTINGS.json
@@ -0,0 +1,73 @@
+{
+  "accountId": 123456,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "version": 1,
+  "features": [{
+    "status": "ON",
+    "name": "Feature1",
+    "impactCampaign": {},
+    "rules": [{
+      "ruleKey": "rolloutRule1",
+      "type": "FLAG_ROLLOUT",
+      "variationId": 1,
+      "campaignId": 1
+    }],
+    "type": "FEATURE_FLAG",
+    "metrics": [{
+      "identifier": "custom1",
+      "mca": -1,
+      "id": 1,
+      "type": "REVENUE_TRACKING"
+    }],
+    "id": 1,
+    "key": "feature1"
+  }],
+  "campaigns": [{
+    "status": "RUNNING",
+    "variations": [{
+      "variables": [{
+        "value": 10,
+        "type": "integer",
+        "id": 1,
+        "key": "int"
+      },
+        {
+          "value": 20.01,
+          "type": "double",
+          "id": 2,
+          "key": "float"
+        },
+        {
+          "value": "test",
+          "type": "string",
+          "id": 3,
+          "key": "string"
+        },
+        {
+          "value": false,
+          "type": "boolean",
+          "id": 4,
+          "key": "boolean"
+        },
+        {
+          "value": {
+            "name": "VWO"
+          },
+          "type": "json",
+          "id": 5,
+          "key": "json"
+        }
+      ],
+      "name": "Rollout-rule-1",
+      "segments": {},
+      "id": 1,
+      "weight": 100
+    }],
+    "segments": {},
+    "type": "FLAG_ROLLOUT",
+    "isForcedVariationEnabled": false,
+    "id": 1,
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1"
+  }]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/BASIC_ROLLOUT_TESTING_RULE_SETTINGS.json b/fme-android/src/test/resources/BASIC_ROLLOUT_TESTING_RULE_SETTINGS.json
new file mode 100644
index 0000000..e7f2d54
--- /dev/null
+++ b/fme-android/src/test/resources/BASIC_ROLLOUT_TESTING_RULE_SETTINGS.json
@@ -0,0 +1,164 @@
+{
+  "features": [{
+    "key": "feature1",
+    "name": "Feature1",
+    "metrics": [{
+      "id": 1,
+      "type": "REVENUE_TRACKING",
+      "identifier": "custom1",
+      "mca": -1
+    }],
+    "rules": [{
+      "variationId": 1,
+      "type": "FLAG_ROLLOUT",
+      "campaignId": 1,
+      "ruleKey": "rolloutRule1"
+    },
+      {
+        "campaignId": 2,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule1"
+      }
+    ],
+    "type": "FEATURE_FLAG",
+    "impactCampaign": {},
+    "id": 1,
+    "status": "ON"
+  }],
+  "version": 1,
+  "accountId": 12345,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "campaigns": [{
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1",
+    "id": 1,
+    "segments": {},
+    "isForcedVariationEnabled": false,
+    "variations": [{
+      "variables": [{
+        "key": "int",
+        "id": 1,
+        "value": 10,
+        "type": "integer"
+      },
+        {
+          "key": "float",
+          "id": 2,
+          "value": 20.01,
+          "type": "double"
+        },
+        {
+          "key": "string",
+          "id": 3,
+          "value": "test",
+          "type": "string"
+        },
+        {
+          "key": "boolean",
+          "id": 4,
+          "value": false,
+          "type": "boolean"
+        },
+        {
+          "key": "json",
+          "id": 5,
+          "value": "{\"name\": \"varun\"}",
+          "type": "json"
+        }
+      ],
+      "id": 1,
+      "segments": {},
+      "weight": 100,
+      "name": "Rollout-rule-1"
+    }],
+    "type": "FLAG_ROLLOUT",
+    "status": "RUNNING"
+  },
+    {
+      "key": "feature1_testingRule1",
+      "name": "feature1_testingRule1",
+      "id": 2,
+      "segments": {},
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "test",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": "{\"name\": \"varun\"}",
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "test_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "variation": 1,
+                "name": "VWO"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS.json b/fme-android/src/test/resources/MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS.json
new file mode 100644
index 0000000..efd99dd
--- /dev/null
+++ b/fme-android/src/test/resources/MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS.json
@@ -0,0 +1,639 @@
+{
+  "features": [{
+    "key": "feature1",
+    "name": "Feature1",
+    "metrics": [{
+      "id": 1,
+      "type": "REVENUE_TRACKING",
+      "identifier": "custom1",
+      "mca": -1
+    }],
+    "rules": [{
+      "variationId": 1,
+      "type": "FLAG_ROLLOUT",
+      "campaignId": 1,
+      "ruleKey": "rolloutRule1"
+    },
+      {
+        "campaignId": 2,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule1"
+      },
+      {
+        "variationId": 2,
+        "campaignId": 3,
+        "type": "FLAG_PERSONALIZE",
+        "ruleKey": "personalizeRule1"
+      },
+      {
+        "campaignId": 4,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule2"
+      },
+      {
+        "campaignId": 5,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule3"
+      },
+      {
+        "campaignId": 6,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule4"
+      },
+      {
+        "campaignId": 7,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule5"
+      }
+    ],
+    "type": "FEATURE_FLAG",
+    "impactCampaign": {},
+    "id": 1,
+    "status": "ON"
+  }],
+  "groups": {
+    "1": {
+      "et": 2,
+      "p": [
+        "4",
+        "3"
+      ],
+      "campaigns": [
+        "3_1",
+        "4",
+        "6",
+        "7"
+      ],
+      "wt": {
+        "6": 50,
+        "7": 50
+      },
+      "name": "Group 1"
+    }
+  },
+  "campaignGroups": {
+    "3_1": 1,
+    "4": 1,
+    "6": 1,
+    "7": 1
+  },
+  "version": 1,
+  "accountId": 12345,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "campaigns": [{
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1",
+    "id": 1,
+    "segments": {},
+    "isForcedVariationEnabled": false,
+    "variations": [{
+      "variables": [{
+        "key": "int",
+        "id": 1,
+        "value": 10,
+        "type": "integer"
+      },
+        {
+          "key": "float",
+          "id": 2,
+          "value": 20.01,
+          "type": "double"
+        },
+        {
+          "key": "string",
+          "id": 3,
+          "value": "rollout1",
+          "type": "string"
+        },
+        {
+          "key": "boolean",
+          "id": 4,
+          "value": false,
+          "type": "boolean"
+        },
+        {
+          "key": "json",
+          "id": 5,
+          "value": {
+            "campaign": "rollout1"
+          },
+          "type": "json"
+        }
+      ],
+      "id": 1,
+      "segments": {},
+      "weight": 100,
+      "name": "Rollout-rule-1"
+    }],
+    "type": "FLAG_ROLLOUT",
+    "status": "RUNNING"
+  },
+    {
+      "key": "feature1_testingRule1",
+      "name": "feature1_testingRule1",
+      "id": 2,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "100"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing1",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing1"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing1_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing1_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_personalizeRule1",
+      "name": "feature1_personalizeRule1",
+      "id": 3,
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 100,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 11,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.02,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "personalizeRule1_variation",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": true,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "personalizeRule1_variation"
+            },
+            "type": "json"
+          }
+        ],
+        "segments": {
+          "or": [{
+            "custom_variable": {
+              "name": "personalise"
+            }
+          }]
+        },
+        "name": "Personalize-rule-1"
+      }],
+      "segments": {},
+      "type": "FLAG_PERSONALIZE",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule2",
+      "name": "feature1_testingRule2",
+      "id": 4,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "firstname": "testingRule2"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing2",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing2"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing2_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing2_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule3",
+      "name": "feature1_testingRule3",
+      "id": 5,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "lastname": "vwo"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing3",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing3"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing3_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing3_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule4",
+      "name": "feature1_testingRule4",
+      "id": 6,
+      "segments": {},
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing4",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing4"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing4_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing4_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule5",
+      "name": "feature1_testingRule5",
+      "id": 7,
+      "segments": {},
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing5",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing5"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing5_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing5_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS.json b/fme-android/src/test/resources/MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS.json
new file mode 100644
index 0000000..c85f3b5
--- /dev/null
+++ b/fme-android/src/test/resources/MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS.json
@@ -0,0 +1,444 @@
+{
+  "features": [{
+    "key": "feature1",
+    "name": "Feature1",
+    "metrics": [{
+      "id": 1,
+      "type": "REVENUE_TRACKING",
+      "identifier": "custom1",
+      "mca": -1
+    }],
+    "rules": [{
+      "variationId": 1,
+      "type": "FLAG_ROLLOUT",
+      "campaignId": 1,
+      "ruleKey": "rolloutRule1"
+    },
+      {
+        "campaignId": 2,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule1"
+      },
+      {
+        "variationId": 2,
+        "campaignId": 3,
+        "type": "FLAG_PERSONALIZE",
+        "ruleKey": "personalizeRule1"
+      },
+      {
+        "campaignId": 4,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule2"
+      },
+      {
+        "campaignId": 5,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule3"
+      }
+    ],
+    "type": "FEATURE_FLAG",
+    "impactCampaign": {},
+    "id": 1,
+    "status": "ON"
+  }],
+  "groups": {
+    "1": {
+      "campaigns": [
+        "2",
+        "3_1",
+        "5"
+      ],
+      "name": "Group 1"
+    }
+  },
+  "campaignGroups": {
+    "2": 1,
+    "3_1": 1,
+    "5": 1
+  },
+  "version": 1,
+  "accountId": 12345,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "campaigns": [{
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1",
+    "id": 1,
+    "segments": {},
+    "isForcedVariationEnabled": false,
+    "variations": [{
+      "variables": [{
+        "key": "int",
+        "id": 1,
+        "value": 10,
+        "type": "integer"
+      },
+        {
+          "key": "float",
+          "id": 2,
+          "value": 20.01,
+          "type": "double"
+        },
+        {
+          "key": "string",
+          "id": 3,
+          "value": "rollout1",
+          "type": "string"
+        },
+        {
+          "key": "boolean",
+          "id": 4,
+          "value": false,
+          "type": "boolean"
+        },
+        {
+          "key": "json",
+          "id": 5,
+          "value": {
+            "campaign": "rollout1"
+          },
+          "type": "json"
+        }
+      ],
+      "id": 1,
+      "segments": {},
+      "weight": 100,
+      "name": "Rollout-rule-1"
+    }],
+    "type": "FLAG_ROLLOUT",
+    "status": "RUNNING"
+  },
+    {
+      "key": "feature1_testingRule1",
+      "name": "feature1_testingRule1",
+      "id": 2,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "100"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing1",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing1"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing1_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing1_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_personalizeRule1",
+      "name": "feature1_personalizeRule1",
+      "id": 3,
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 100,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 11,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.02,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "personalizeRule1_variation",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": true,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "personalizeRule1_variation"
+            },
+            "type": "json"
+          }
+        ],
+        "segments": {
+          "or": [{
+            "custom_variable": {
+              "name": "personalise"
+            }
+          }]
+        },
+        "name": "Personalize-rule-1"
+      }],
+      "segments": {},
+      "type": "FLAG_PERSONALIZE",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule2",
+      "name": "feature1_testingRule2",
+      "id": 4,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "firstname": "testingRule2"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing2",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing2"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing2_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing2_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule3",
+      "name": "feature1_testingRule3",
+      "id": 5,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "lastname": "vwo"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing3",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing3"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing3_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing3_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS.json b/fme-android/src/test/resources/NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS.json
new file mode 100644
index 0000000..5aeb991
--- /dev/null
+++ b/fme-android/src/test/resources/NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS.json
@@ -0,0 +1,163 @@
+{
+  "features": [{
+    "key": "feature1",
+    "name": "Feature1",
+    "metrics": [{
+      "id": 1,
+      "type": "REVENUE_TRACKING",
+      "identifier": "custom1",
+      "mca": -1
+    }],
+    "rules": [{
+      "campaignId": 2,
+      "type": "FLAG_TESTING",
+      "ruleKey": "testingRule1"
+    }],
+    "type": "FEATURE_FLAG",
+    "impactCampaign": {},
+    "id": 1,
+    "status": "ON"
+  }],
+  "version": 1,
+  "accountId": 12345,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "campaigns": [{
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1",
+    "id": 1,
+    "segments": {},
+    "isForcedVariationEnabled": false,
+    "variations": [{
+      "variables": [{
+        "key": "int",
+        "id": 1,
+        "value": 10,
+        "type": "integer"
+      },
+        {
+          "key": "float",
+          "id": 2,
+          "value": 20.01,
+          "type": "double"
+        },
+        {
+          "key": "string",
+          "id": 3,
+          "value": "test",
+          "type": "string"
+        },
+        {
+          "key": "boolean",
+          "id": 4,
+          "value": false,
+          "type": "boolean"
+        },
+        {
+          "key": "json",
+          "id": 5,
+          "value": "{\"name\": \"varun\"}",
+          "type": "json"
+        }
+      ],
+      "id": 1,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "gt(100)"
+          }
+        }]
+      },
+      "weight": 100,
+      "name": "Rollout-rule-1"
+    }],
+    "type": "FLAG_ROLLOUT",
+    "status": "RUNNING"
+  },
+    {
+      "key": "feature1_testingRule1",
+      "name": "feature1_testingRule1",
+      "id": 2,
+      "segments": {},
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "test",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": "{\"name\": \"varun\"}",
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "test_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "variation": 1,
+                "name": "VWO"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS.json b/fme-android/src/test/resources/ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS.json
new file mode 100644
index 0000000..017c60a
--- /dev/null
+++ b/fme-android/src/test/resources/ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS.json
@@ -0,0 +1,329 @@
+{
+  "features": [{
+    "key": "feature1",
+    "name": "Feature1",
+    "metrics": [{
+      "id": 1,
+      "type": "REVENUE_TRACKING",
+      "identifier": "custom1",
+      "mca": -1
+    }],
+    "rules": [{
+      "variationId": 1,
+      "type": "FLAG_ROLLOUT",
+      "campaignId": 1,
+      "ruleKey": "rolloutRule1"
+    },
+      {
+        "variationId": 2,
+        "type": "FLAG_ROLLOUT",
+        "campaignId": 1,
+        "ruleKey": "rolloutRule2"
+      },
+      {
+        "campaignId": 2,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule1"
+      },
+      {
+        "campaignId": 3,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule2"
+      }
+    ],
+    "type": "FEATURE_FLAG",
+    "impactCampaign": {},
+    "id": 1,
+    "status": "ON"
+  }],
+  "version": 1,
+  "accountId": 12345,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "campaigns": [{
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1",
+    "id": 1,
+    "segments": {},
+    "isForcedVariationEnabled": false,
+    "variations": [{
+      "variables": [{
+        "key": "int",
+        "id": 1,
+        "value": 10,
+        "type": "integer"
+      },
+        {
+          "key": "float",
+          "id": 2,
+          "value": 20.01,
+          "type": "double"
+        },
+        {
+          "key": "string",
+          "id": 3,
+          "value": "rollout1",
+          "type": "string"
+        },
+        {
+          "key": "boolean",
+          "id": 4,
+          "value": false,
+          "type": "boolean"
+        },
+        {
+          "key": "json",
+          "id": 5,
+          "value": {
+            "campaign": "rollout1"
+          },
+          "type": "json"
+        }
+      ],
+      "id": 1,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "100"
+          }
+        }]
+      },
+      "weight": 100,
+      "name": "Rollout-rule-1"
+    },
+      {
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 11,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.02,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "rollout1",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": true,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "rollout2"
+            },
+            "type": "json"
+          }
+        ],
+        "id": 2,
+        "segments": {
+          "or": [{
+            "custom_variable": {
+              "price": "200"
+            }
+          }]
+        },
+        "weight": 100,
+        "name": "Rollout-rule-2"
+      }
+    ],
+    "type": "FLAG_ROLLOUT",
+    "status": "RUNNING"
+  },
+    {
+      "key": "feature1_testingRule1",
+      "name": "feature1_testingRule1",
+      "id": 2,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "100"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing1",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing1"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing1_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing1_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    },
+    {
+      "key": "feature1_testingRule2",
+      "name": "feature1_testingRule2",
+      "id": 3,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "200"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": false,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testin2",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing2"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default"
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing2_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing2_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS.json b/fme-android/src/test/resources/TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS.json
new file mode 100644
index 0000000..28780a1
--- /dev/null
+++ b/fme-android/src/test/resources/TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS.json
@@ -0,0 +1,184 @@
+{
+  "features": [{
+    "key": "feature1",
+    "name": "Feature1",
+    "metrics": [{
+      "id": 1,
+      "type": "REVENUE_TRACKING",
+      "identifier": "custom1",
+      "mca": -1
+    }],
+    "rules": [{
+      "variationId": 1,
+      "type": "FLAG_ROLLOUT",
+      "campaignId": 1,
+      "ruleKey": "rolloutRule1"
+    },
+      {
+        "campaignId": 2,
+        "type": "FLAG_TESTING",
+        "ruleKey": "testingRule1"
+      }
+    ],
+    "type": "FEATURE_FLAG",
+    "impactCampaign": {},
+    "id": 1,
+    "status": "ON"
+  }],
+  "version": 1,
+  "accountId": 12345,
+  "sdkKey": "000000000000_MASKED_000000000000",
+  "campaigns": [{
+    "key": "feature1_rolloutRule1",
+    "name": "feature1_rolloutRule1",
+    "id": 1,
+    "segments": {},
+    "isForcedVariationEnabled": false,
+    "variations": [{
+      "variables": [{
+        "key": "int",
+        "id": 1,
+        "value": 10,
+        "type": "integer"
+      },
+        {
+          "key": "float",
+          "id": 2,
+          "value": 20.01,
+          "type": "double"
+        },
+        {
+          "key": "string",
+          "id": 3,
+          "value": "rollout1",
+          "type": "string"
+        },
+        {
+          "key": "boolean",
+          "id": 4,
+          "value": false,
+          "type": "boolean"
+        },
+        {
+          "key": "json",
+          "id": 5,
+          "value": {
+            "campaign": "rollout1"
+          },
+          "type": "json"
+        }
+      ],
+      "id": 1,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "100"
+          }
+        }]
+      },
+      "weight": 100,
+      "name": "Rollout-rule-1"
+    }],
+    "type": "FLAG_ROLLOUT",
+    "status": "RUNNING"
+  },
+    {
+      "key": "feature1_testingRule1",
+      "name": "feature1_testingRule1",
+      "id": 2,
+      "segments": {
+        "or": [{
+          "custom_variable": {
+            "price": "200"
+          }
+        }]
+      },
+      "isForcedVariationEnabled": true,
+      "variations": [{
+        "weight": 50,
+        "id": 1,
+        "variables": [{
+          "key": "int",
+          "id": 1,
+          "value": 10,
+          "type": "integer"
+        },
+          {
+            "key": "float",
+            "id": 2,
+            "value": 20.01,
+            "type": "double"
+          },
+          {
+            "key": "string",
+            "id": 3,
+            "value": "testing1",
+            "type": "string"
+          },
+          {
+            "key": "boolean",
+            "id": 4,
+            "value": false,
+            "type": "boolean"
+          },
+          {
+            "key": "json",
+            "id": 5,
+            "value": {
+              "campaign": "testing1"
+            },
+            "type": "json"
+          }
+        ],
+        "name": "Default",
+        "segments": {
+          "or": [{
+            "user": "user_id,user_id_9"
+          }]
+        }
+      },
+        {
+          "weight": 50,
+          "id": 2,
+          "variables": [{
+            "key": "int",
+            "id": 1,
+            "value": 11,
+            "type": "integer"
+          },
+            {
+              "key": "float",
+              "id": 2,
+              "value": 20.02,
+              "type": "double"
+            },
+            {
+              "key": "string",
+              "id": 3,
+              "value": "testing1_variation",
+              "type": "string"
+            },
+            {
+              "key": "boolean",
+              "id": 4,
+              "value": true,
+              "type": "boolean"
+            },
+            {
+              "key": "json",
+              "id": 5,
+              "value": {
+                "campaign": "testing1_variation"
+              },
+              "type": "json"
+            }
+          ],
+          "name": "Variation-1"
+        }
+      ],
+      "percentTraffic": 100,
+      "type": "FLAG_TESTING",
+      "status": "RUNNING"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/assets/debug-messages.json b/fme-android/src/test/resources/assets/debug-messages.json
new file mode 100644
index 0000000..c36b139
--- /dev/null
+++ b/fme-android/src/test/resources/assets/debug-messages.json
@@ -0,0 +1,13 @@
+{
+  "API_CALLED": "API called: {apiName}",
+  "SERVICE_INITIALIZED": "VWO {service} initialized while creating an instance of SDK",
+
+  "EXPERIMENTS_EVALUATION_WHEN_ROLLOUT_PASSED": "Rollout rule got passed for user {userId}. Hence, evaluating experiments",
+  "EXPERIMENTS_EVALUATION_WHEN_NO_ROLLOUT_PRESENT": "No Rollout rules present for the feature. Hence, checking experiment rules",
+
+  "USER_BUCKET_TO_VARIATION": "User ID: {userId} for experiment: {campaignKey} having percent traffic: {percentTraffic} got bucket-value as {bucketValue} and hash-value as {hashValue}",
+
+  "IMPRESSION_FOR_TRACK_USER": "Impression built for vwo_variationShown event for Account ID:{accountId}, User ID:{userId}, and experiment ID:{campaignId}",
+  "IMPRESSION_FOR_TRACK_GOAL": "Impression built for {eventName} event for Account ID:{accountId}, and user ID:{userId}",
+  "IMPRESSION_FOR_SYNC_VISITOR_PROP": "Impression built for {eventName} event for Account ID:{accountId}, and user ID:{userId}"
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/assets/error-messages.json b/fme-android/src/test/resources/assets/error-messages.json
new file mode 100644
index 0000000..916ef40
--- /dev/null
+++ b/fme-android/src/test/resources/assets/error-messages.json
@@ -0,0 +1,27 @@
+
+{
+  "INIT_OPTIONS_ERROR": "[ERROR]: VWO-SDK {date} Options should be of type object",
+  "INIT_OPTIONS_SDK_KEY_ERROR": "[ERROR]: VWO-SDK {date} Please provide the sdkKey in the options and should be a of type string",
+  "INIT_OPTIONS_ACCOUNT_ID_ERROR": "[ERROR]: VWO-SDK {date} Please provide VWO account ID in the options and should be a of type string|number",
+
+  "INIT_OPTIONS_INVALID": "Invalid {key} passed in options. Should be of type: {correctType} and greater than equal to 1000",
+
+  "SETTINGS_FETCH_ERROR": "Settings could not be fetched. Error: {err}",
+  "SETTINGS_SCHEMA_INVALID": "Settings are not valid. Failed schema validation",
+
+  "POLLING_FETCH_SETTINGS_FAILED": "Error while fetching VWO settings with polling",
+
+  "API_THROW_ERROR": "API - {apiName} failed to execute. Trace - {err}",
+  "API_INVALID_PARAM": "{key} passed to {apiName} API is not of valid type. Got type: {type}, should be: {correctType}",
+  "API_SETTING_INVALID": "Settings are not valid. Contact VWO Support",
+  "API_CONTEXT_INVALID": "Context should be an object and must contain a mandatory key - id, which is User ID",
+
+  "FEATURE_NOT_FOUND": "Feature not found for the key {featureKey}",
+  "EVENT_NOT_FOUND": "Event {eventName} not found in any of the features metrics",
+
+  "STORED_DATA_ERROR": "Error in getting data from storage. Error: {err}",
+
+  "GATEWAY_URL_ERROR": "Please provide a valid URL for VWO Gateway Service",
+
+  "NETWORK_CALL_FAILED": "Error occurred while sending {method} request. Error: {err}"
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/assets/info-messages.json b/fme-android/src/test/resources/assets/info-messages.json
new file mode 100644
index 0000000..85bff37
--- /dev/null
+++ b/fme-android/src/test/resources/assets/info-messages.json
@@ -0,0 +1,31 @@
+{
+  "ON_READY_ALREADY_RESOLVED": "[INFO]: VWO-SDK {date} {apiName} already resolved",
+  "ON_READY_SETTINGS_FAILED": "[INFO]: VWO-SDK {date} VWO settings could not be fetched",
+
+  "POLLING_SET_SETTINGS": "There's a change in settings from the last settings fetched. Hence, instantiating a new VWO client internally",
+  "POLLING_NO_CHANGE_IN_SETTINGS": "No change in settings with the last settings fetched. Hence, not instantiating new VWO client",
+
+  "SETTINGS_FETCH_SUCCESS": "Settings fetched successfully",
+
+  "CLIENT_INITIALIZED": "VWO Client initialized",
+
+  "STORED_VARIATION_FOUND": "Variation {variationKey} found in storage for the user {userId} for the {experimentType} experiment:{experimentKey}",
+
+  "USER_PART_OF_CAMPAIGN": "User ID:{userId} is {notPart} part of experiment: {campaignKey}",
+  "SEGMENTATION_SKIP": "For userId:{userId} of experiment:{campaignKey}, segments was missing. Hence, skipping segmentation",
+  "SEGMENTATION_STATUS": "Segmentation {status} for userId:{userId} of experiment:{campaignKey}",
+
+  "USER_CAMPAIGN_BUCKET_INFO": "User ID:{userId} for experiment:{campaignKey} {status}",
+
+  "WHITELISTING_SKIP": "Whitelisting is not used for experiment:{campaignKey}, hence skipping evaluating whitelisting {variation} for User ID:{userId}",
+  "WHITELISTING_STATUS": "User ID:{userId} for experiment:{campaignKey} {status} whitelisting {variationString}",
+
+  "VARIATION_RANGE_ALLOCATION": "Variation:{variationKey} of experiment:{campaignKey} having weight:{variationWeight} got bucketing range: ({startRange} - {endRange})",
+
+  "IMPACT_ANALYSIS": "Sending data for Impact Campaign for the user {userId}",
+
+  "MEG_SKIP_ROLLOUT_EVALUATE_EXPERIMENTS": "No rollout rule found for feature:{featureKey}. Hence, evaluating experiments",
+  "MEG_CAMPAIGN_FOUND_IN_STORAGE": "Campaign {campaignKey} found in storage for user ID:{userId}",
+  "MEG_CAMPAIGN_ELIGIBLE": "Campaign {campaignKey} is eligible for user ID:{userId}",
+  "MEG_WINNER_CAMPAIGN": "MEG: Campaign {campaignKey} is the winner for group {groupId} for user ID:{userId} {algo}"
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/assets/trace-messages.json b/fme-android/src/test/resources/assets/trace-messages.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/fme-android/src/test/resources/assets/trace-messages.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/assets/warn-messages.json b/fme-android/src/test/resources/assets/warn-messages.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/fme-android/src/test/resources/assets/warn-messages.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/index.json b/fme-android/src/test/resources/index.json
new file mode 100644
index 0000000..fb44279
--- /dev/null
+++ b/fme-android/src/test/resources/index.json
@@ -0,0 +1,587 @@
+{
+  "GETFLAG_WITHOUT_STORAGE": [{
+    "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+    "description": "should return false for a flag that does not exists and return default values for variables",
+    "context": {
+      "id": "user_id"
+    },
+    "featureKey": "invalid_key",
+    "expectation": {
+      "isEnabled": false,
+      "intVariable": 1,
+      "stringVariable": "VWO",
+      "floatVariable": 1.1,
+      "booleanVariable": false,
+      "jsonVariable": {}
+    }
+  },
+    {
+      "settings": "BASIC_ROLLOUT_SETTINGS",
+      "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation",
+      "context": {
+        "id": "user_id"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "test",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "name": "VWO"
+        }
+      }
+    },
+    {
+      "settings": "BASIC_ROLLOUT_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation and Testing Rule",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        }
+      }
+    },
+    {
+      "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having no segmentation and only testing rule",
+      "context": {
+        "id": "user_id"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        }
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return false for a flag that does not exists and return default values for variables",
+      "context": {
+        "id": "user_id"
+      },
+      "featureKey": "feature_not_present",
+      "expectation": {
+        "isEnabled": false,
+        "intVariable": 1,
+        "stringVariable": "VWO",
+        "floatVariable": 1.1,
+        "booleanVariable": false,
+        "jsonVariable": {}
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout1 and testingRule1",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing1_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing1_variation"
+        }
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout2 and testingRule2",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing2_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing2_variation"
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass control whitelisting for testingRule1",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing1"
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that fails whitelisting for testingRule1 and only rollout rule pass",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "rollout1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "rollout1"
+        }
+      }
+    }
+  ],
+  "GETFLAG_MEG_RANDOM": [{
+    "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+    "description": "should return true for a flag having 3 meg campaigns, where testingRule1 and personaliseRule1 are eligible",
+    "context": {
+      "id": "user_id_1",
+      "customVariables": {
+        "price": 100,
+        "name": "personalise"
+      }
+    },
+    "featureKey": "feature1",
+    "expectation": {
+      "isEnabled": true,
+      "intVariable": 11,
+      "stringVariable": "personalizeRule1_variation",
+      "floatVariable": 20.02,
+      "booleanVariable": true,
+      "jsonVariable": {
+        "campaign": "personalizeRule1_variation"
+      }
+    }
+  },
+    {
+      "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+      "description": "should return true for a flag having 3 meg campaigns, where all campaigns are inEligible",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "firstname": "testingRule2"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing2",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing2"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+      "description": "should return true for a flag having 3 meg campaigns, where personalizeRule1 and testingRule3 are eligible but testingRule2 will be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise",
+          "lastname": "vwo",
+          "firstname": "testingRule2"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing2",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing2"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+      "description": "should return true for a flag having 3 meg campaigns, where E2 and E4 are eligible and E4 will be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise",
+          "lastname": "vwo"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing3_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing3_variation"
+        }
+      }
+    }
+  ],
+  "GETFLAG_MEG_ADVANCE": [{
+    "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+    "description": "should return true for a flag having 4 meg campaigns, where testingRule1 should be returned as it pass pre segment",
+    "context": {
+      "id": "user_id_1",
+      "customVariables": {
+        "price": 100,
+        "name": "personalise",
+        "firstname": "testingRule2"
+      }
+    },
+    "featureKey": "feature1",
+    "expectation": {
+      "isEnabled": true,
+      "intVariable": 11,
+      "stringVariable": "testing1_variation",
+      "floatVariable": 20.02,
+      "booleanVariable": true,
+      "jsonVariable": {
+        "campaign": "testing1_variation"
+      }
+    }
+  },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where testingRule2 should be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise",
+          "firstname": "testingRule2"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing2",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing2"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where personaliseRule1 should be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "personalizeRule1_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "personalizeRule1_variation"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where testingRule3 should be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "lastname": "vwo"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing3_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing3_variation"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where testingRule5 should be returned",
+      "context": {
+        "id": "user_id_1"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing5_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing5_variation"
+        }
+      }
+    }
+  ],
+  "GETFLAG_WITH_STORAGE": [{
+    "settings": "BASIC_ROLLOUT_SETTINGS",
+    "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation",
+    "context": {
+      "id": "user_id"
+    },
+    "featureKey": "feature1",
+    "expectation": {
+      "isEnabled": true,
+      "intVariable": 10,
+      "stringVariable": "test",
+      "floatVariable": 20.01,
+      "booleanVariable": false,
+      "jsonVariable": {
+        "name": "VWO"
+      },
+      "storageData": {
+        "rolloutKey": "feature1_rolloutRule1",
+        "rolloutVariationId": 1
+      }
+    }
+  },
+    {
+      "settings": "BASIC_ROLLOUT_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation and Testing Rule",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1,
+          "experimentKey": "feature1_testingRule1",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having no segmentation and only testing rule",
+      "context": {
+        "id": "user_id_4"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        },
+        "storageData": {
+          "experimentKey": "feature1_testingRule1",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+      "description": "should return false for a flag that does not exist and return default values for variables",
+      "context": {
+        "id": "user_id_5"
+      },
+      "featureKey": "feature_not_present",
+      "expectation": {
+        "isEnabled": false,
+        "intVariable": 1,
+        "stringVariable": "VWO",
+        "floatVariable": 1.1,
+        "booleanVariable": false,
+        "jsonVariable": {},
+        "storageData": {}
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return false for a flag that does not pass pre segment of any rule",
+      "context": {
+        "id": "user_id_6"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": false,
+        "intVariable": 1,
+        "stringVariable": "VWO",
+        "floatVariable": 1.1,
+        "booleanVariable": false,
+        "jsonVariable": {},
+        "storageData": {}
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout1 and testingRule1",
+      "context": {
+        "id": "user_id_7",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing1_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing1_variation"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1,
+          "experimentKey": "feature1_testingRule1",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout2 and testingRule2",
+      "context": {
+        "id": "user_id_8",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing2_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing2_variation"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 2,
+          "experimentKey": "feature1_testingRule2",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass control whitelisting for testingRule1",
+      "context": {
+        "id": "user_id_9",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing1"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1,
+          "experimentVariationId": 1,
+          "experimentKey": "feature1_testingRule1"
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that fails whitelisting for testingRule1 and only rollout rule pass",
+      "context": {
+        "id": "user_id_10",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "rollout1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "rollout1"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/fme-android/src/test/resources/testData/index.json b/fme-android/src/test/resources/testData/index.json
new file mode 100644
index 0000000..fb44279
--- /dev/null
+++ b/fme-android/src/test/resources/testData/index.json
@@ -0,0 +1,587 @@
+{
+  "GETFLAG_WITHOUT_STORAGE": [{
+    "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+    "description": "should return false for a flag that does not exists and return default values for variables",
+    "context": {
+      "id": "user_id"
+    },
+    "featureKey": "invalid_key",
+    "expectation": {
+      "isEnabled": false,
+      "intVariable": 1,
+      "stringVariable": "VWO",
+      "floatVariable": 1.1,
+      "booleanVariable": false,
+      "jsonVariable": {}
+    }
+  },
+    {
+      "settings": "BASIC_ROLLOUT_SETTINGS",
+      "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation",
+      "context": {
+        "id": "user_id"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "test",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "name": "VWO"
+        }
+      }
+    },
+    {
+      "settings": "BASIC_ROLLOUT_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation and Testing Rule",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        }
+      }
+    },
+    {
+      "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having no segmentation and only testing rule",
+      "context": {
+        "id": "user_id"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        }
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return false for a flag that does not exists and return default values for variables",
+      "context": {
+        "id": "user_id"
+      },
+      "featureKey": "feature_not_present",
+      "expectation": {
+        "isEnabled": false,
+        "intVariable": 1,
+        "stringVariable": "VWO",
+        "floatVariable": 1.1,
+        "booleanVariable": false,
+        "jsonVariable": {}
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout1 and testingRule1",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing1_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing1_variation"
+        }
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout2 and testingRule2",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing2_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing2_variation"
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass control whitelisting for testingRule1",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing1"
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that fails whitelisting for testingRule1 and only rollout rule pass",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "rollout1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "rollout1"
+        }
+      }
+    }
+  ],
+  "GETFLAG_MEG_RANDOM": [{
+    "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+    "description": "should return true for a flag having 3 meg campaigns, where testingRule1 and personaliseRule1 are eligible",
+    "context": {
+      "id": "user_id_1",
+      "customVariables": {
+        "price": 100,
+        "name": "personalise"
+      }
+    },
+    "featureKey": "feature1",
+    "expectation": {
+      "isEnabled": true,
+      "intVariable": 11,
+      "stringVariable": "personalizeRule1_variation",
+      "floatVariable": 20.02,
+      "booleanVariable": true,
+      "jsonVariable": {
+        "campaign": "personalizeRule1_variation"
+      }
+    }
+  },
+    {
+      "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+      "description": "should return true for a flag having 3 meg campaigns, where all campaigns are inEligible",
+      "context": {
+        "id": "user_id",
+        "customVariables": {
+          "firstname": "testingRule2"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing2",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing2"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+      "description": "should return true for a flag having 3 meg campaigns, where personalizeRule1 and testingRule3 are eligible but testingRule2 will be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise",
+          "lastname": "vwo",
+          "firstname": "testingRule2"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing2",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing2"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_RANDOM_ALGO_SETTINGS",
+      "description": "should return true for a flag having 3 meg campaigns, where E2 and E4 are eligible and E4 will be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise",
+          "lastname": "vwo"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing3_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing3_variation"
+        }
+      }
+    }
+  ],
+  "GETFLAG_MEG_ADVANCE": [{
+    "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+    "description": "should return true for a flag having 4 meg campaigns, where testingRule1 should be returned as it pass pre segment",
+    "context": {
+      "id": "user_id_1",
+      "customVariables": {
+        "price": 100,
+        "name": "personalise",
+        "firstname": "testingRule2"
+      }
+    },
+    "featureKey": "feature1",
+    "expectation": {
+      "isEnabled": true,
+      "intVariable": 11,
+      "stringVariable": "testing1_variation",
+      "floatVariable": 20.02,
+      "booleanVariable": true,
+      "jsonVariable": {
+        "campaign": "testing1_variation"
+      }
+    }
+  },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where testingRule2 should be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise",
+          "firstname": "testingRule2"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing2",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing2"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where personaliseRule1 should be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "name": "personalise"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "personalizeRule1_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "personalizeRule1_variation"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where testingRule3 should be returned",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "lastname": "vwo"
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing3_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing3_variation"
+        }
+      }
+    },
+    {
+      "settings": "MEG_CAMPAIGN_ADVANCE_ALGO_SETTINGS",
+      "description": "should return true for a flag having 4 meg campaigns, where testingRule5 should be returned",
+      "context": {
+        "id": "user_id_1"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing5_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing5_variation"
+        }
+      }
+    }
+  ],
+  "GETFLAG_WITH_STORAGE": [{
+    "settings": "BASIC_ROLLOUT_SETTINGS",
+    "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation",
+    "context": {
+      "id": "user_id"
+    },
+    "featureKey": "feature1",
+    "expectation": {
+      "isEnabled": true,
+      "intVariable": 10,
+      "stringVariable": "test",
+      "floatVariable": 20.01,
+      "booleanVariable": false,
+      "jsonVariable": {
+        "name": "VWO"
+      },
+      "storageData": {
+        "rolloutKey": "feature1_rolloutRule1",
+        "rolloutVariationId": 1
+      }
+    }
+  },
+    {
+      "settings": "BASIC_ROLLOUT_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having settings: 100% traffic allocation and no segmentation and Testing Rule",
+      "context": {
+        "id": "user_id_1",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1,
+          "experimentKey": "feature1_testingRule1",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+      "description": "should return true for a flag having no segmentation and only testing rule",
+      "context": {
+        "id": "user_id_4"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "test_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "name": "VWO",
+          "variation": 1
+        },
+        "storageData": {
+          "experimentKey": "feature1_testingRule1",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "NO_ROLLOUT_ONLY_TESTING_RULE_SETTINGS",
+      "description": "should return false for a flag that does not exist and return default values for variables",
+      "context": {
+        "id": "user_id_5"
+      },
+      "featureKey": "feature_not_present",
+      "expectation": {
+        "isEnabled": false,
+        "intVariable": 1,
+        "stringVariable": "VWO",
+        "floatVariable": 1.1,
+        "booleanVariable": false,
+        "jsonVariable": {},
+        "storageData": {}
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return false for a flag that does not pass pre segment of any rule",
+      "context": {
+        "id": "user_id_6"
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": false,
+        "intVariable": 1,
+        "stringVariable": "VWO",
+        "floatVariable": 1.1,
+        "booleanVariable": false,
+        "jsonVariable": {},
+        "storageData": {}
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout1 and testingRule1",
+      "context": {
+        "id": "user_id_7",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing1_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing1_variation"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1,
+          "experimentKey": "feature1_testingRule1",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "ROLLOUT_TESTING_PRE_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass pre segment for rollout2 and testingRule2",
+      "context": {
+        "id": "user_id_8",
+        "customVariables": {
+          "price": 200
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 11,
+        "stringVariable": "testing2_variation",
+        "floatVariable": 20.02,
+        "booleanVariable": true,
+        "jsonVariable": {
+          "campaign": "testing2_variation"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 2,
+          "experimentKey": "feature1_testingRule2",
+          "experimentVariationId": 2
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that pass control whitelisting for testingRule1",
+      "context": {
+        "id": "user_id_9",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "testing1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "testing1"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1,
+          "experimentVariationId": 1,
+          "experimentKey": "feature1_testingRule1"
+        }
+      }
+    },
+    {
+      "settings": "TESTING_WHITELISTING_SEGMENT_RULE_SETTINGS",
+      "description": "should return true for a flag that fails whitelisting for testingRule1 and only rollout rule pass",
+      "context": {
+        "id": "user_id_10",
+        "customVariables": {
+          "price": 100
+        }
+      },
+      "featureKey": "feature1",
+      "expectation": {
+        "isEnabled": true,
+        "intVariable": 10,
+        "stringVariable": "rollout1",
+        "floatVariable": 20.01,
+        "booleanVariable": false,
+        "jsonVariable": {
+          "campaign": "rollout1"
+        },
+        "storageData": {
+          "rolloutKey": "feature1_rolloutRule1",
+          "rolloutVariationId": 1
+        }
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 35fa112..21c4f28 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,8 +24,8 @@ android.nonTransitiveRClass=true
 
 POM_NAME=VWO FME Android SDK
 POM_ARTIFACT_ID=vwo-fme-android-sdk
-VERSION_NAME=0.1.0
-VERSION_CODE=1
+VERSION_NAME=1.0.0
+VERSION_CODE=3
 GROUP=com.vwo.sdk
 
 #POM details
@@ -44,4 +44,4 @@ android.enableJetifier=true
 POM_PACKAGING=aar
 POM_DEVELOPER_EMAIL=integration@vwo.com
 NEXUS_USERNAME=
-NEXUS_PASSWORD=
\ No newline at end of file
+NEXUS_PASSWORD=