diff --git a/.gitignore b/.gitignore
index 71f9913..45b2fa1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ g*.iml
 .gradle
 .idea
 .kotlin
+libs
 
 local.properties
 
diff --git a/DemoApp/DemoAppJava/app/build.gradle b/DemoApp/DemoAppJava/app/build.gradle
index 44e2c9b..498bbfa 100644
--- a/DemoApp/DemoAppJava/app/build.gradle
+++ b/DemoApp/DemoAppJava/app/build.gradle
@@ -41,11 +41,18 @@ android {
 
 dependencies {
     // Optable SDK
-    implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    if (useReleaseSdk == "true") {
+        implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    } else {
+        implementation "co.optable:local-sdk"
+    }
 
     // Google Mobile Ads
     implementation 'com.google.android.gms:play-services-ads:24.6.0'
 
+    // Prebid Ads
+    implementation "org.prebid:prebid-mobile-sdk:3.0.2"
+
     // Base Android
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
     implementation 'com.android.support:multidex:1.0.3'
diff --git a/DemoApp/DemoAppJava/app/src/main/AndroidManifest.xml b/DemoApp/DemoAppJava/app/src/main/AndroidManifest.xml
index 6757516..a228588 100644
--- a/DemoApp/DemoAppJava/app/src/main/AndroidManifest.xml
+++ b/DemoApp/DemoAppJava/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name=".TheApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -15,8 +16,8 @@
         android:usesCleartextTraffic="true">
 
         <activity
-            android:exported="true"
             android:name="co.optable.demoappjava.MainActivity"
+            android:exported="true"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/MainActivity.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/MainActivity.java
index ef7ce31..1e9d150 100644
--- a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/MainActivity.java
+++ b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/MainActivity.java
@@ -1,32 +1,55 @@
 package co.optable.demoappjava;
 
 import android.os.Bundle;
+import android.util.Log;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
-import co.optable.android_sdk.OptableSDK;
+import com.google.android.gms.ads.MobileAds;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import org.prebid.mobile.PrebidMobile;
+import org.prebid.mobile.api.data.InitializationStatus;
 
 public class MainActivity extends AppCompatActivity {
 
-    public static OptableSDK OPTABLE;
+    private static final String TAG = "MainActivity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        MainActivity.OPTABLE = new OptableSDK(this.getApplicationContext(), "sandbox.optable.co", "ios-sdk-demo");
-
+        initGoogleAds();
+        initPrebidSdk();
         initUi();
     }
 
+    private void initGoogleAds() {
+        MobileAds.initialize(this, initializationStatus -> {
+        });
+    }
+
+    private void initPrebidSdk() {
+        PrebidMobile.setPrebidServerAccountId("0689a263-318d-448b-a3d4-b02e8a709d9d");
+        PrebidMobile.initializeSdk(getApplicationContext(), "https://prebid-server-test-j.prebid.org/openrtb2/auction", status -> {
+            if (status == InitializationStatus.SUCCEEDED) {
+                Log.d(TAG, "SDK initialized successfully!");
+            } else {
+                Log.e(TAG, "SDK initialization error: " + status.getDescription());
+            }
+        });
+    }
+
     private void initUi() {
         BottomNavigationView navView = findViewById(R.id.nav_view);
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
-        AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder(R.id.navigation_identify, R.id.navigation_gambanner).build();
+        AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder(
+                R.id.navigation_identify,
+                R.id.navigation_gambanner,
+                R.id.navigation_prebid
+        ).build();
         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
         NavigationUI.setupWithNavController(navView, navController);
     }
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/TheApplication.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/TheApplication.java
new file mode 100644
index 0000000..0f84c6b
--- /dev/null
+++ b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/TheApplication.java
@@ -0,0 +1,19 @@
+package co.optable.demoappjava;
+
+import android.app.Application;
+import co.optable.android_sdk.OptableConfig;
+import co.optable.android_sdk.OptableSDK;
+
+public class TheApplication extends Application {
+
+    public static OptableSDK optable;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        OptableConfig config = new OptableConfig(this, "prebidtest", "js-sdk", "ca.edge.optable.co");
+        optable = new OptableSDK(config);
+    }
+
+}
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GAMBanner/GAMBannerFragment.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GAMBanner/GAMBannerFragment.java
deleted file mode 100644
index d717c4f..0000000
--- a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GAMBanner/GAMBannerFragment.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package co.optable.demoappjava.ui.GAMBanner;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
-import co.optable.demoappjava.R;
-import com.google.android.gms.ads.AdRequest;
-import com.google.android.gms.ads.admanager.AdManagerAdRequest;
-import com.google.android.gms.ads.admanager.AdManagerAdView;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class GAMBannerFragment extends Fragment {
-
-    private AdManagerAdView mAdView;
-    private TextView statusTextView;
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.fragment_gambanner, container, false);
-        initUi(root);
-        return root;
-    }
-
-    private void initUi(View root) {
-        mAdView = root.findViewById(R.id.publisherAdView);
-        statusTextView = root.findViewById(R.id.targetingDataView);
-
-        root.findViewById(R.id.btnLoadBanner).setOnClickListener(view -> onClickLoadAd());
-        root.findViewById(R.id.btnCachedBanner).setOnClickListener(view -> onClickCachedBanner());
-        root.findViewById(R.id.btnClearCache).setOnClickListener(view -> onClickClearCache());
-    }
-
-    /**
-     * Loads targeting data and then the GAM banner
-     */
-    private void onClickLoadAd() {
-        statusTextView.setText("");
-
-        MainActivity.OPTABLE
-                .targeting()
-                .observe(getViewLifecycleOwner(), result -> {
-                    AdManagerAdRequest.Builder adRequest = new AdManagerAdRequest.Builder();
-
-                    if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-                        HashMap<String, List<String>> data = result.getData();
-                        changeStatusText("Loading GAM ad with targeting data", data);
-
-                        if (data != null) {
-                            for (String key : data.keySet()) {
-                                List<String> values = data.get(key);
-                                if (values == null) continue;
-                                adRequest.addCustomTargeting(key, values);
-                            }
-                        }
-                    } else {
-                        changeStatusText("Error getting targeting data: " + result.getMessage(), null);
-                    }
-
-                    mAdView.loadAd(adRequest.build());
-                    profile();
-                    witness();
-                });
-    }
-
-    /**
-     * Loads targeting data from cache and then the GAM banner
-     */
-    private void onClickCachedBanner() {
-        statusTextView.setText("");
-
-        AdRequest.Builder adRequest = new AdRequest.Builder();
-        HashMap<String, List<String>> data = MainActivity.OPTABLE.targetingFromCache();
-
-        if (data != null) {
-            changeStatusText("Loading GAM ad with cached targeting data", data);
-            for (String key : data.keySet()) {
-                List<String> values = data.get(key);
-                if (values == null) continue;
-                adRequest.addCustomTargeting(key, values);
-            }
-        } else {
-            changeStatusText("Targeting data cache empty.", null);
-        }
-
-        mAdView.loadAd(adRequest.build());
-        profile();
-        witness();
-    }
-
-    /**
-     * Clears targeting data cache.
-     */
-    private void onClickClearCache() {
-        statusTextView.setText("Clearing targeting data cache.\n\n");
-        MainActivity.OPTABLE.targetingClearCache();
-    }
-
-    private void profile() {
-        HashMap<String, Object> traits = new HashMap<>();
-        traits.put("gender", "F");
-        traits.put("age", 38);
-        traits.put("hasAccount", true);
-
-        MainActivity.OPTABLE
-                .profile(traits)
-                .observe(getViewLifecycleOwner(), result -> {
-                    if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-                        appendStatusText("Success calling profile API to set traits on user.");
-                    } else {
-                        appendStatusText("Error during sending profile: " + result.getMessage());
-                    }
-                });
-    }
-
-    private void witness() {
-        HashMap<String, Object> eventProperties = new HashMap<>();
-        eventProperties.put("exampleKey", "exampleValue");
-        eventProperties.put("exampleKey2", 123);
-        eventProperties.put("exampleKey3", false);
-
-        MainActivity.OPTABLE
-                .witness("GAMBannerFragment.loadAdButtonClicked", eventProperties)
-                .observe(getViewLifecycleOwner(), result -> {
-                    if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-                        appendStatusText("Success calling witness API to log loadAdButtonClicked event.");
-                    } else {
-                        appendStatusText("Error during sending witness: " + result.getMessage());
-                    }
-                });
-    }
-
-    private void changeStatusText(@NonNull String message, @Nullable HashMap<String, List<String>> optableResponse) {
-        StringBuilder formattedMessage = new StringBuilder(message);
-        if (optableResponse != null) {
-            formattedMessage.append("\n\nTargeting data: ");
-            for (Map.Entry<String, ? extends Collection<?>> entry : optableResponse.entrySet()) {
-                formattedMessage.append(entry.getKey())
-                        .append(" = ")
-                        .append(entry.getValue())
-                        .append("\n");
-            }
-        }
-        statusTextView.setText(formattedMessage.toString());
-    }
-
-    private void appendStatusText(@NonNull String message) {
-        statusTextView.append("\n\n" + message);
-    }
-
-}
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GamBannerFragment.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GamBannerFragment.java
new file mode 100644
index 0000000..c9fceaf
--- /dev/null
+++ b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/GamBannerFragment.java
@@ -0,0 +1,150 @@
+package co.optable.demoappjava.ui;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import co.optable.android_sdk.OptableIdentifiers;
+import co.optable.android_sdk.OptableResult;
+import co.optable.android_sdk.OptableSDK;
+import co.optable.android_sdk.OptableTargeting;
+import co.optable.demoappjava.R;
+import co.optable.demoappjava.TheApplication;
+import com.google.android.gms.ads.admanager.AdManagerAdRequest;
+import com.google.android.gms.ads.admanager.AdManagerAdView;
+import kotlin.Unit;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GamBannerFragment extends Fragment {
+
+    private AdManagerAdView mAdView;
+    private TextView statusTextView;
+
+    private OptableSDK optable;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.fragment_gambanner, container, false);
+        initUi(root);
+        optable = TheApplication.optable;
+        return root;
+    }
+
+    private void initUi(View root) {
+        mAdView = root.findViewById(R.id.publisherAdView);
+        statusTextView = root.findViewById(R.id.statusTextView);
+
+        root.findViewById(R.id.btnLoadBanner).setOnClickListener(view -> onClickLoadAd());
+        root.findViewById(R.id.btnCachedBanner).setOnClickListener(view -> onClickCachedBanner());
+        root.findViewById(R.id.btnClearCache).setOnClickListener(view -> onClickClearCache());
+    }
+
+    /**
+     * Loads targeting data and then the GAM banner
+     */
+    private void onClickLoadAd() {
+        statusTextView.setText("");
+
+        OptableIdentifiers ids = new OptableIdentifiers.Builder().email("test@test.com").build();
+        optable.targeting(ids, result -> {
+            AdManagerAdRequest.Builder requestBuilder = new AdManagerAdRequest.Builder();
+
+            if (result instanceof OptableResult.Success<OptableTargeting> success) {
+                applyOptableToGam(requestBuilder, success.getData());
+                changeStatusText("Targeting success: " + success.getData().getAudiences());
+            } else if (result instanceof OptableResult.Error<OptableTargeting> error) {
+                changeStatusText("Targeting error: " + error.getMessage());
+            }
+
+            mAdView.loadAd(requestBuilder.build());
+            profile();
+            witness();
+        });
+    }
+
+    /**
+     * Loads targeting data from cache and then the GAM banner
+     */
+    private void onClickCachedBanner() {
+        statusTextView.setText("");
+
+        AdManagerAdRequest.Builder requestBuilder = new AdManagerAdRequest.Builder();
+
+        OptableTargeting optableTargeting = optable.targetingFromCache();
+        if (optableTargeting != null) {
+            changeStatusText("Targeting from cache: " + optableTargeting.getAudiences());
+            applyOptableToGam(requestBuilder, optableTargeting);
+        } else {
+            changeStatusText("Targeting cache is empty");
+        }
+
+        mAdView.loadAd(requestBuilder.build());
+        profile();
+        witness();
+    }
+
+    private void applyOptableToGam(AdManagerAdRequest.Builder builder, @Nullable OptableTargeting targeting) {
+        if (targeting == null) return;
+
+        Map<String, List<String>> audiences = targeting.getAudiences();
+        if (audiences != null) {
+            for (Map.Entry<String, List<String>> entry : audiences.entrySet()) {
+                builder.addCustomTargeting(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    /**
+     * Clears targeting data cache.
+     */
+    private void onClickClearCache() {
+        statusTextView.setText("Clearing targeting data cache.");
+        optable.targetingClearCache();
+    }
+
+    private void profile() {
+        HashMap<String, Object> traits = new HashMap<>();
+        traits.put("gender", "F");
+        traits.put("age", 38);
+        traits.put("hasAccount", true);
+
+        optable.profile(traits, result -> {
+            if (result instanceof OptableResult.Success) {
+                appendStatusText("Profile success");
+            } else if (result instanceof OptableResult.Error<Unit> error) {
+                appendStatusText("Profile error: " + error.getMessage());
+            }
+        });
+    }
+
+    private void witness() {
+        HashMap<String, Object> eventProperties = new HashMap<>();
+        eventProperties.put("exampleKey", "exampleValue");
+        eventProperties.put("exampleKey2", 123);
+        eventProperties.put("exampleKey3", false);
+
+        optable.witness("GAMBannerFragment.loadAdButtonClicked", eventProperties, result -> {
+            if (result instanceof OptableResult.Success) {
+                appendStatusText("Witness success");
+            } else if (result instanceof OptableResult.Error<Unit> error) {
+                appendStatusText("Witness error: " + error.getMessage());
+            }
+        });
+    }
+
+    private void changeStatusText(@NonNull String message) {
+        statusTextView.setText(message);
+    }
+
+    private void appendStatusText(@NonNull String message) {
+        statusTextView.append("\n\n" + message);
+    }
+
+}
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/Identify/IdentifyFragment.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/IdentifyFragment.java
similarity index 65%
rename from DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/Identify/IdentifyFragment.java
rename to DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/IdentifyFragment.java
index b73e02c..78a9287 100644
--- a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/Identify/IdentifyFragment.java
+++ b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/IdentifyFragment.java
@@ -1,4 +1,4 @@
-package co.optable.demoappjava.ui.Identify;
+package co.optable.demoappjava.ui;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -9,9 +9,11 @@
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import co.optable.android_sdk.OptableResult;
 import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
 import co.optable.demoappjava.R;
+import co.optable.demoappjava.TheApplication;
+import kotlin.Unit;
 
 public class IdentifyFragment extends Fragment {
 
@@ -19,10 +21,13 @@ public class IdentifyFragment extends Fragment {
     private EditText emailText;
     private Switch gaidSwitch;
 
+    private OptableSDK optable;
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_identify, container, false);
         initUi(root);
+        optable = TheApplication.optable;
         return root;
     }
 
@@ -37,19 +42,13 @@ private void initUi(View root) {
     private void onClickIdentify() {
         identifyView.setText("");
 
-        MainActivity.OPTABLE
-                .identify(emailText.getText().toString(), gaidSwitch.isChecked())
-                .observe(getViewLifecycleOwner(), result -> {
-                    String msg = "Calling identify API... ";
-
-                    if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-                        msg += "Success";
-                    } else {
-                        msg += "\n\nOptableSDK Error: " + result.getMessage();
-                    }
-
-                    identifyView.setText(msg);
-                });
+        optable.identify(emailText.getText().toString(), gaidSwitch.isChecked(), result -> {
+            if (result instanceof OptableResult.Success) {
+                identifyView.setText("Identify success");
+            } else if (result instanceof OptableResult.Error<Unit> error) {
+                identifyView.setText("Identify error: " + error.getMessage());
+            }
+        });
     }
 
 }
diff --git a/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/PrebidBannerFragment.java b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/PrebidBannerFragment.java
new file mode 100644
index 0000000..eeb6619
--- /dev/null
+++ b/DemoApp/DemoAppJava/app/src/main/java/co/optable/demoappjava/ui/PrebidBannerFragment.java
@@ -0,0 +1,205 @@
+package co.optable.demoappjava.ui;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import co.optable.android_sdk.OptableIdentifiers;
+import co.optable.android_sdk.OptableResult;
+import co.optable.android_sdk.OptableSDK;
+import co.optable.android_sdk.OptableTargeting;
+import co.optable.demoappjava.R;
+import co.optable.demoappjava.TheApplication;
+import com.google.android.gms.ads.AdListener;
+import com.google.android.gms.ads.LoadAdError;
+import com.google.android.gms.ads.admanager.AdManagerAdRequest;
+import com.google.android.gms.ads.admanager.AdManagerAdView;
+import kotlin.Unit;
+import org.jetbrains.annotations.NotNull;
+import org.prebid.mobile.BannerAdUnit;
+import org.prebid.mobile.TargetingParams;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class PrebidBannerFragment extends Fragment {
+
+    private static final String GAM_AD_UNIT_ID = "/21808260008/prebid_demo_app_original_api_banner";
+    private static final String PREBID_CONFIG_ID = "prebid-demo-banner-320-50";
+    private static final int WIDTH = 320;
+    private static final int HEIGHT = 50;
+
+    private AdManagerAdView adView;
+    private BannerAdUnit prebidAdUnit;
+
+    private ViewGroup adContainer;
+    private TextView statusTextView;
+
+    private OptableSDK optable;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.fragment_prebid, container, false);
+        initUi(root);
+        optable = TheApplication.optable;
+        return root;
+    }
+
+    private void initUi(View root) {
+        statusTextView = root.findViewById(R.id.statusTextView);
+        adContainer = root.findViewById(R.id.adContainer);
+
+        root.findViewById(R.id.btnLoadBanner).setOnClickListener(view -> onClickLoadAd());
+        root.findViewById(R.id.btnCachedBanner).setOnClickListener(view -> onClickCachedBanner());
+        root.findViewById(R.id.btnClearCache).setOnClickListener(view -> onClickClearCache());
+    }
+
+    /**
+     * Loads targeting data and then the GAM banner
+     */
+    private void onClickLoadAd() {
+        statusTextView.setText("");
+
+        OptableIdentifiers ids = new OptableIdentifiers.Builder().email("test@test.com").build();
+        optable.targeting(ids, optableResult -> {
+            OptableTargeting optableTargeting = null;
+            if (optableResult instanceof OptableResult.Success<OptableTargeting> success) {
+                changeStatusText("Targeting success: " + success.getData().getAudiences());
+                optableTargeting = success.getData();
+            } else if (optableResult instanceof OptableResult.Error<OptableTargeting> error) {
+                changeStatusText("Targeting error: " + error.getMessage());
+            }
+
+            loadPrebidAd(optableTargeting);
+            profile();
+            witness();
+        });
+    }
+
+    private void loadPrebidAd(@Nullable OptableTargeting optableTargeting) {
+        AdManagerAdRequest.Builder adRequestBuilder = new AdManagerAdRequest.Builder();
+
+        prebidAdUnit = new BannerAdUnit(PREBID_CONFIG_ID, WIDTH, HEIGHT);
+        applyOptableToPrebid(optableTargeting);
+        prebidAdUnit.fetchDemand(adRequestBuilder, resultCode -> {
+            appendStatusText("Prebid ads loading status: " + resultCode.toString());
+            loadGamAd(adRequestBuilder, optableTargeting);
+        });
+    }
+
+    private void loadGamAd(AdManagerAdRequest.Builder requestBuilder, @Nullable OptableTargeting optableTargeting) {
+        applyOptableToGam(requestBuilder, optableTargeting);
+
+        adContainer.removeAllViews();
+
+        adView = new AdManagerAdView(requireContext());
+        adView.setAdUnitId(GAM_AD_UNIT_ID);
+        adView.setAdSizes(new com.google.android.gms.ads.AdSize(WIDTH, HEIGHT));
+        adView.setAdListener(new AdListener() {
+            @Override
+            public void onAdLoaded() {
+                super.onAdLoaded();
+                appendStatusText("Google ad loaded");
+            }
+
+            @Override
+            public void onAdFailedToLoad(@NonNull @NotNull LoadAdError loadAdError) {
+                appendStatusText("Google ad failed to load: " + loadAdError.getMessage());
+            }
+        });
+        adView.loadAd(requestBuilder.build());
+
+        adContainer.addView(adView);
+    }
+
+    /**
+     * Loads targeting data from cache and then the GAM banner
+     */
+    private void onClickCachedBanner() {
+        OptableTargeting targeting = optable.targetingFromCache();
+        if (targeting != null) {
+            changeStatusText("Targeting from cache: " + targeting.getAudiences());
+        } else {
+            changeStatusText("Targeting data cache empty.");
+        }
+
+        loadPrebidAd(targeting);
+        profile();
+        witness();
+    }
+
+    /**
+     * Clears targeting data cache.
+     */
+    private void onClickClearCache() {
+        statusTextView.setText("Clearing targeting data cache.\n\n");
+        optable.targetingClearCache();
+    }
+
+    private void applyOptableToPrebid(@Nullable OptableTargeting optableResult) {
+        if (optableResult == null) {
+            TargetingParams.setGlobalOrtbConfig(null);
+            return;
+        }
+
+        String openRtbJson = optableResult.getOpenRtbJson();
+        if (openRtbJson != null) {
+            TargetingParams.setGlobalOrtbConfig(openRtbJson);
+        }
+    }
+
+    private void applyOptableToGam(AdManagerAdRequest.Builder builder, @Nullable OptableTargeting targeting) {
+        if (targeting == null) return;
+
+        Map<String, List<String>> audiences = targeting.getAudiences();
+        if (audiences != null) {
+            for (Map.Entry<String, List<String>> entry : audiences.entrySet()) {
+                builder.addCustomTargeting(entry.getKey(), entry.getValue());
+            }
+        }
+    }
+
+    private void profile() {
+        HashMap<String, Object> traits = new HashMap<>();
+        traits.put("gender", "F");
+        traits.put("age", 38);
+        traits.put("hasAccount", true);
+
+        optable.profile(traits, result -> {
+            if (result instanceof OptableResult.Success) {
+                appendStatusText("Profile Success");
+            } else if (result instanceof OptableResult.Error<Unit> error) {
+                appendStatusText("Profile Error: " + error.getMessage());
+            }
+        });
+    }
+
+    private void witness() {
+        HashMap<String, Object> eventProperties = new HashMap<>();
+        eventProperties.put("exampleKey", "exampleValue");
+        eventProperties.put("exampleKey2", 123);
+        eventProperties.put("exampleKey3", false);
+
+        optable.witness("GAMBannerFragment.loadAdButtonClicked", eventProperties, result -> {
+            if (result instanceof OptableResult.Success) {
+                appendStatusText("Witness Success");
+            } else if (result instanceof OptableResult.Error<Unit> error) {
+                appendStatusText("Witness Error: " + error.getMessage());
+            }
+        });
+    }
+
+    private void changeStatusText(@NonNull String message) {
+        statusTextView.setText(message);
+    }
+
+    private void appendStatusText(@NonNull String message) {
+        statusTextView.append("\n\n" + message);
+    }
+
+}
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/res/layout/activity_main.xml b/DemoApp/DemoAppJava/app/src/main/res/layout/activity_main.xml
index 38c0aa8..472e2b8 100644
--- a/DemoApp/DemoAppJava/app/src/main/res/layout/activity_main.xml
+++ b/DemoApp/DemoAppJava/app/src/main/res/layout/activity_main.xml
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="?attr/actionBarSize">
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/bottom_nav_menu" />
+    android:orientation="vertical"
+    android:layout_height="match_parent">
 
     <fragment
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@id/nav_view"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/mobile_navigation" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/windowBackground"
+        app:menu="@menu/bottom_nav_menu" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_gambanner.xml b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_gambanner.xml
index 2fe5cbc..4ef0fcd 100644
--- a/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_gambanner.xml
+++ b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_gambanner.xml
@@ -1,10 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.GAMBanner.GAMBannerFragment">
+    android:orientation="vertical"
+    tools:context=".ui.GamBannerFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btnLoadBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Load Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnCachedBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Cached Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnClearCache"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Clear Cache"
+            android:textSize="8sp" />
+
+    </LinearLayout>
 
     <com.google.android.gms.ads.admanager.AdManagerAdView
         android:id="@+id/publisherAdView"
@@ -14,55 +49,20 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="84dp"
         app:adSize="BANNER"
-        app:adUnitId="/22081946781/android-sdk-demo/mobile-leaderboard"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.494"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:adUnitId="/22081946781/android-sdk-demo/mobile-leaderboard" />
 
-    <Button
-        android:id="@+id/btnLoadBanner"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="8dp"
-        android:text="Load Banner"
-        android:textSize="8sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.054"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/btnCachedBanner"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="8dp"
-        android:text="Cached Banner"
-        android:textSize="8sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:padding="8dp"
+        android:layout_weight="1">
 
-    <Button
-        android:id="@+id/btnClearCache"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="8dp"
-        android:text="Clear Cache"
-        android:textSize="8sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.945"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/statusTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
-    <TextView
-        android:id="@+id/targetingDataView"
-        android:layout_width="291dp"
-        android:layout_height="346dp"
-        android:layout_marginTop="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnLoadBanner" />
+    </ScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_identify.xml b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_identify.xml
index 3a3f9fb..e33f755 100644
--- a/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_identify.xml
+++ b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_identify.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.Identify.IdentifyFragment">
+    android:paddingTop="50dp"
+    tools:context=".ui.IdentifyFragment">
 
     <EditText
         android:id="@+id/editTextTextEmailAddress"
         android:layout_width="350dp"
         android:layout_height="60dp"
         android:ems="10"
+        android:text="test@test.com"
         android:inputType="textEmailAddress"
         android:hint="Email address"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_prebid.xml b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_prebid.xml
new file mode 100644
index 0000000..c040af2
--- /dev/null
+++ b/DemoApp/DemoAppJava/app/src/main/res/layout/fragment_prebid.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.PrebidBannerFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btnLoadBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Load Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnCachedBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Cached Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnClearCache"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Clear Cache"
+            android:textSize="8sp" />
+
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:padding="8dp"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/statusTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/adContainer"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/res/menu/bottom_nav_menu.xml b/DemoApp/DemoAppJava/app/src/main/res/menu/bottom_nav_menu.xml
index 10eb35f..897adf3 100644
--- a/DemoApp/DemoAppJava/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/DemoApp/DemoAppJava/app/src/main/res/menu/bottom_nav_menu.xml
@@ -11,4 +11,9 @@
         android:icon="@drawable/ic_gambanner_black_24dp"
         android:title="GAM Banner" />
 
+    <item
+        android:id="@+id/navigation_prebid"
+        android:icon="@drawable/ic_gambanner_black_24dp"
+        android:title="Prebid Banner" />
+
 </menu>
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/app/src/main/res/navigation/mobile_navigation.xml b/DemoApp/DemoAppJava/app/src/main/res/navigation/mobile_navigation.xml
index c0c1bd1..13dd083 100644
--- a/DemoApp/DemoAppJava/app/src/main/res/navigation/mobile_navigation.xml
+++ b/DemoApp/DemoAppJava/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,14 +7,20 @@
 
     <fragment
         android:id="@+id/navigation_identify"
-        android:name="co.optable.demoappjava.ui.Identify.IdentifyFragment"
+        android:name="co.optable.demoappjava.ui.IdentifyFragment"
         android:label="Identify API"
         tools:layout="@layout/fragment_identify" />
 
     <fragment
         android:id="@+id/navigation_gambanner"
-        android:name="co.optable.demoappjava.ui.GAMBanner.GAMBannerFragment"
+        android:name="co.optable.demoappjava.ui.GamBannerFragment"
         android:label="GAM Banner"
         tools:layout="@layout/fragment_gambanner" />
 
+    <fragment
+        android:id="@+id/navigation_prebid"
+        android:name="co.optable.demoappjava.ui.PrebidBannerFragment"
+        android:label="Prebid Banner"
+        tools:layout="@layout/fragment_prebid" />
+
 </navigation>
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/gradle.properties b/DemoApp/DemoAppJava/gradle.properties
index c52ac9b..d71fa93 100644
--- a/DemoApp/DemoAppJava/gradle.properties
+++ b/DemoApp/DemoAppJava/gradle.properties
@@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+useReleaseSdk=false
\ No newline at end of file
diff --git a/DemoApp/DemoAppJava/settings.gradle b/DemoApp/DemoAppJava/settings.gradle
index f864b0b..f9963f4 100644
--- a/DemoApp/DemoAppJava/settings.gradle
+++ b/DemoApp/DemoAppJava/settings.gradle
@@ -16,4 +16,9 @@ dependencyResolutionManagement {
 }
 
 include ':app'
+includeBuild("../..") {
+    dependencySubstitution {
+        substitute(module("co.optable:local-sdk")).using(project(":android_sdk"))
+    }
+}
 rootProject.name = "DemoJava"
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/build.gradle b/DemoApp/DemoAppKotlin/app/build.gradle
index 810d749..327d076 100644
--- a/DemoApp/DemoAppKotlin/app/build.gradle
+++ b/DemoApp/DemoAppKotlin/app/build.gradle
@@ -41,11 +41,18 @@ android {
 
 dependencies {
     // Optable SDK
-    implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    if (useReleaseSdk == "true") {
+        implementation "com.github.Optable:optable-android-sdk:" + versioning.getVersionName(false)
+    } else {
+        implementation "co.optable:local-sdk"
+    }
 
     // Google Mobile Ads
     implementation 'com.google.android.gms:play-services-ads:24.6.0'
 
+    // Prebid Ads
+    implementation "org.prebid:prebid-mobile-sdk:3.0.2"
+
     // Base Android
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
     implementation 'com.android.support:multidex:1.0.3'
diff --git a/DemoApp/DemoAppKotlin/app/src/main/AndroidManifest.xml b/DemoApp/DemoAppKotlin/app/src/main/AndroidManifest.xml
index cabe392..d4616e9 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/AndroidManifest.xml
+++ b/DemoApp/DemoAppKotlin/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
 
     <application
         android:allowBackup="true"
+        android:name=".TheApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/MainActivity.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/MainActivity.kt
index 1b55b9b..3a4cc9f 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/MainActivity.kt
+++ b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/MainActivity.kt
@@ -5,33 +5,58 @@
 package co.optable.androidsdkdemo
 
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import co.optable.android_sdk.OptableSDK
+import com.google.android.gms.ads.MobileAds
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import org.prebid.mobile.PrebidMobile
 
 class MainActivity : AppCompatActivity() {
 
     companion object {
-        lateinit var OPTABLE: OptableSDK
+        private const val TAG = "MainActivity"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        OPTABLE = OptableSDK(this, "sandbox.optable.co", "ios-sdk-demo")
-
+        initGoogleAds()
+        initPrebidSdk()
         initUi()
     }
 
+    private fun initGoogleAds() {
+        MobileAds.initialize(this) {}
+    }
+
+    private fun initPrebidSdk() {
+        PrebidMobile.setPrebidServerAccountId("0689a263-318d-448b-a3d4-b02e8a709d9d")
+        PrebidMobile.initializeSdk(
+            applicationContext,
+            "https://prebid-server-test-j.prebid.org/openrtb2/auction"
+        ) { status: org.prebid.mobile.api.data.InitializationStatus? ->
+            if (status == org.prebid.mobile.api.data.InitializationStatus.SUCCEEDED) {
+                Log.d(TAG, "SDK initialized successfully!")
+            } else {
+                Log.e(TAG, "SDK initialization error: ${status?.description}")
+            }
+        }
+    }
+
     private fun initUi() {
         val navView: BottomNavigationView = findViewById(R.id.nav_view)
         val navController = findNavController(R.id.nav_host_fragment)
-        val appBarConfiguration = AppBarConfiguration(setOf(R.id.navigation_identify, R.id.navigation_gambanner))
+        val appBarConfiguration = AppBarConfiguration(
+            setOf(
+                R.id.navigation_identify,
+                R.id.navigation_gambanner,
+            )
+        )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
     }
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/TheApplication.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/TheApplication.kt
new file mode 100644
index 0000000..96b4d42
--- /dev/null
+++ b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/TheApplication.kt
@@ -0,0 +1,20 @@
+package co.optable.androidsdkdemo
+
+import android.app.Application
+import co.optable.android_sdk.OptableConfig
+import co.optable.android_sdk.OptableSDK
+
+class TheApplication : Application() {
+
+    companion object {
+        lateinit var optable: OptableSDK
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        val config = OptableConfig(this, "prebidtest", "js-sdk", host = "ca.edge.optable.co")
+        optable = OptableSDK(config)
+    }
+
+}
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GAMBanner/GAMBannerFragment.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GAMBanner/GAMBannerFragment.kt
deleted file mode 100644
index 6a560aa..0000000
--- a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GAMBanner/GAMBannerFragment.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.androidsdkdemo.ui.GAMBanner
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
-import co.optable.android_sdk.OptableSDK
-import co.optable.android_sdk.OptableTargetingResponse
-import co.optable.androidsdkdemo.MainActivity
-import co.optable.androidsdkdemo.R
-import com.google.android.gms.ads.admanager.AdManagerAdRequest
-import com.google.android.gms.ads.admanager.AdManagerAdView
-
-class GAMBannerFragment : Fragment() {
-
-    private lateinit var adView: AdManagerAdView
-    private lateinit var statusTextView: TextView
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View? {
-        val root = inflater.inflate(R.layout.fragment_gambanner, container, false)
-        initUi(root)
-        return root
-    }
-
-    private fun initUi(root: View) {
-        adView = root.findViewById(R.id.publisherAdView)
-        statusTextView = root.findViewById(R.id.targetingDataView)
-        statusTextView.text = ""
-
-        root.findViewById<Button>(R.id.btnLoadAd).setOnClickListener {
-            onClickLoadAd()
-        }
-        root.findViewById<Button>(R.id.btnCachedBanner).setOnClickListener {
-            onClickCachedBanner()
-        }
-        root.findViewById<Button>(R.id.btnClearCache).setOnClickListener {
-            onClickClearCache()
-        }
-    }
-
-    /**
-     * Loads targeting data and then the GAM banner.
-     */
-    private fun onClickLoadAd() {
-        MainActivity.OPTABLE
-            .targeting()
-            .observe(viewLifecycleOwner, Observer { result ->
-                val adRequest = AdManagerAdRequest.Builder()
-
-                if (result.status == OptableSDK.Status.SUCCESS) {
-                    result.data?.forEach { (key, values) ->
-                        adRequest.addCustomTargeting(key, values)
-                    }
-                    changeStatusText("Loading GAM ad with targeting data.", result.data)
-                } else {
-                    changeStatusText("Error getting targeting data: ${result.message}")
-                }
-
-                adView.loadAd(adRequest.build())
-
-                profile()
-                witness()
-            })
-    }
-
-    /**
-     * Loads cached targeting and then the GAM banner.
-     */
-    private fun onClickCachedBanner() {
-        val adRequest = AdManagerAdRequest.Builder()
-        val cachedData = MainActivity.OPTABLE.targetingFromCache()
-        if (cachedData != null) {
-            cachedData.forEach { (key, values) ->
-                adRequest.addCustomTargeting(key, values)
-            }
-            changeStatusText("Loading GAM ad with cached targeting data.", cachedData)
-        } else {
-            changeStatusText("Targeting data cache empty.")
-        }
-
-        adView.loadAd(adRequest.build())
-
-        profile()
-        witness()
-    }
-
-    /**
-     * Clears the targeting data cache.
-     */
-    private fun onClickClearCache() {
-        MainActivity.OPTABLE.targetingClearCache()
-        changeStatusText("Cleared targeting data cache.")
-    }
-
-    private fun profile() {
-        MainActivity.OPTABLE
-            .profile(hashMapOf("gender" to "F", "age" to 38, "hasAccount" to true))
-            .observe(viewLifecycleOwner, Observer { result ->
-                if (result.status == OptableSDK.Status.SUCCESS) {
-                    appendStatusText("Success calling profile API to set traits on user.")
-                } else {
-                    appendStatusText("Error during sending profile: ${result.message}")
-                }
-            })
-    }
-
-    private fun witness() {
-        MainActivity.OPTABLE
-            .witness(
-                "GAMBannerFragment.loadAdButtonClicked",
-                hashMapOf("exampleKey" to "exampleValue", "anotherExample" to 123, "foo" to false)
-            )
-            .observe(viewLifecycleOwner, Observer { result ->
-                if (result.status == OptableSDK.Status.SUCCESS) {
-                    appendStatusText("Success calling witness API to log loadAdButtonClicked event.")
-                } else {
-                    appendStatusText("Error during sending witness: ${result.message}")
-                }
-            })
-    }
-
-
-    private fun changeStatusText(message: String, optableResponse: OptableTargetingResponse? = null) {
-        var formattedMessage = message
-        if (optableResponse != null) {
-            formattedMessage += "\n\nTargeting data: "
-            formattedMessage += optableResponse.map { (key, values) -> "$key = ${values}\n" }
-        }
-        statusTextView.text = formattedMessage
-    }
-
-    private fun appendStatusText(message: String) {
-        statusTextView.append("\n\n$message")
-    }
-
-}
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GamBannerFragment.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GamBannerFragment.kt
new file mode 100644
index 0000000..82ea7e1
--- /dev/null
+++ b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/GamBannerFragment.kt
@@ -0,0 +1,158 @@
+package co.optable.androidsdkdemo.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import co.optable.android_sdk.OptableIdentifiers
+import co.optable.android_sdk.OptableResult
+import co.optable.android_sdk.OptableSDK
+import co.optable.android_sdk.OptableTargeting
+import co.optable.androidsdkdemo.R
+import co.optable.androidsdkdemo.TheApplication
+import com.google.android.gms.ads.admanager.AdManagerAdRequest
+import com.google.android.gms.ads.admanager.AdManagerAdView
+
+class GamBannerFragment : Fragment() {
+
+    private lateinit var adView: AdManagerAdView
+    private lateinit var statusTextView: TextView
+
+    private lateinit var optable: OptableSDK
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        val root = inflater.inflate(R.layout.fragment_gambanner, container, false)
+        initUi(root)
+        optable = TheApplication.optable
+        return root
+    }
+
+    private fun initUi(root: View) {
+        adView = root.findViewById(R.id.publisherAdView)
+        statusTextView = root.findViewById(R.id.statusTextView)
+        statusTextView.text = ""
+
+        root.findViewById<Button>(R.id.btnLoadBanner).setOnClickListener {
+            onClickLoadAd()
+        }
+        root.findViewById<Button>(R.id.btnCachedBanner).setOnClickListener {
+            onClickCachedBanner()
+        }
+        root.findViewById<Button>(R.id.btnClearCache).setOnClickListener {
+            onClickClearCache()
+        }
+    }
+
+    /**
+     * Loads targeting data and then the GAM banner.
+     */
+    private fun onClickLoadAd() {
+        val ids = OptableIdentifiers(email = "test@test.com")
+        optable.targeting(ids) { result ->
+            val requestBuilder = AdManagerAdRequest.Builder()
+
+            when (result) {
+                is OptableResult.Success<OptableTargeting> -> {
+                    changeStatusText("Targeting success: ${result.data.audiences}")
+                    applyOptableToGam(requestBuilder, result.data)
+                }
+
+                is OptableResult.Error<OptableTargeting> -> {
+                    changeStatusText("Targeting error: ${result.message}")
+                }
+            }
+
+            adView.loadAd(requestBuilder.build())
+
+            profile()
+            witness()
+        }
+    }
+
+    /**
+     * Loads cached targeting and then the GAM banner.
+     */
+    private fun onClickCachedBanner() {
+        val requestBuilder = AdManagerAdRequest.Builder()
+        val targeting = optable.targetingFromCache()
+        if (targeting != null) {
+            changeStatusText("Targeting from cache: ${targeting.audiences}")
+            applyOptableToGam(requestBuilder, targeting)
+        } else {
+            changeStatusText("Targeting cache is empty")
+        }
+
+        adView.loadAd(requestBuilder.build())
+
+        profile()
+        witness()
+    }
+
+    /**
+     * Clears the targeting data cache.
+     */
+    private fun onClickClearCache() {
+        optable.targetingClearCache()
+        changeStatusText("Cleared targeting data cache.")
+    }
+
+    private fun applyOptableToGam(builder: AdManagerAdRequest.Builder, targeting: OptableTargeting?) {
+        if (targeting == null) return
+
+        val audiences = targeting.audiences
+        if (audiences != null) {
+            for (entry in audiences.entries) {
+                builder.addCustomTargeting(entry.key, entry.value)
+            }
+        }
+    }
+
+    private fun profile() {
+        val traits = hashMapOf<String, Any>("gender" to "F", "age" to 38, "hasAccount" to true)
+        optable.profile(traits) { result ->
+            when (result) {
+                is OptableResult.Success<*> -> {
+                    appendStatusText("Profile success")
+                }
+
+                is OptableResult.Error -> {
+                    appendStatusText("Profile error: ${result.message}")
+                }
+            }
+        }
+    }
+
+    private fun witness() {
+        optable.witness(
+            "GAMBannerFragment.loadAdButtonClicked",
+            hashMapOf("exampleKey" to "exampleValue", "anotherExample" to 123, "foo" to false)
+        ) { result ->
+            when (result) {
+                is OptableResult.Success<*> -> {
+                    appendStatusText("Witness success")
+                }
+
+                is OptableResult.Error -> {
+                    appendStatusText("Witness error: ${result.message}")
+                }
+            }
+        }
+    }
+
+
+    private fun changeStatusText(message: String) {
+        statusTextView.text = message
+    }
+
+    private fun appendStatusText(message: String) {
+        statusTextView.append("\n\n$message")
+    }
+
+}
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/Identify/IdentifyFragment.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/IdentifyFragment.kt
similarity index 66%
rename from DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/Identify/IdentifyFragment.kt
rename to DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/IdentifyFragment.kt
index 953fc34..4cdbbcc 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/Identify/IdentifyFragment.kt
+++ b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/IdentifyFragment.kt
@@ -1,8 +1,4 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.androidsdkdemo.ui.Identify
+package co.optable.androidsdkdemo.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -13,10 +9,10 @@ import android.widget.EditText
 import android.widget.Switch
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
+import co.optable.android_sdk.OptableResult
 import co.optable.android_sdk.OptableSDK
-import co.optable.androidsdkdemo.MainActivity
 import co.optable.androidsdkdemo.R
+import co.optable.androidsdkdemo.TheApplication
 
 class IdentifyFragment : Fragment() {
 
@@ -24,6 +20,8 @@ class IdentifyFragment : Fragment() {
     private lateinit var emailText: EditText
     private lateinit var gaidSwitch: Switch
 
+    private lateinit var optable: OptableSDK
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -31,6 +29,7 @@ class IdentifyFragment : Fragment() {
     ): View? {
         val root = inflater.inflate(R.layout.fragment_identify, container, false)
         initUi(root)
+        optable = TheApplication.optable
         return root
     }
 
@@ -50,18 +49,13 @@ class IdentifyFragment : Fragment() {
         val email = emailText.text.toString()
         val gaidStatus = gaidSwitch.isChecked
 
-        MainActivity.OPTABLE
-            .identify(email, gaidStatus)
-            .observe(viewLifecycleOwner, Observer { result ->
-                var msg = "Calling identify API... "
-                msg += if (result.status == OptableSDK.Status.SUCCESS) {
-                    "Success"
-                } else {
-                    "\n\nOptableSDK Error: ${result.message}"
-                }
-
-                identifyView.text = msg
-            })
+        optable.identify(email, gaidStatus) { result ->
+            val msg = when (result) {
+                is OptableResult.Success -> "Identify success"
+                is OptableResult.Error -> "Identify error: ${result.message}"
+            }
+            identifyView.text = msg
+        }
     }
 
 }
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/PrebidBannerFragment.kt b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/PrebidBannerFragment.kt
new file mode 100644
index 0000000..c5ad1e3
--- /dev/null
+++ b/DemoApp/DemoAppKotlin/app/src/main/java/co/optable/androidsdkdemo/ui/PrebidBannerFragment.kt
@@ -0,0 +1,217 @@
+/*
+ * Copyright © 2020 Optable Technologies Inc. All rights reserved.
+ * See LICENSE for details.
+ */
+package co.optable.androidsdkdemo.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import co.optable.android_sdk.OptableIdentifiers
+import co.optable.android_sdk.OptableResult
+import co.optable.android_sdk.OptableSDK
+import co.optable.android_sdk.OptableTargeting
+import co.optable.androidsdkdemo.R
+import co.optable.androidsdkdemo.TheApplication
+import com.google.android.gms.ads.AdListener
+import com.google.android.gms.ads.AdSize
+import com.google.android.gms.ads.LoadAdError
+import com.google.android.gms.ads.admanager.AdManagerAdRequest
+import com.google.android.gms.ads.admanager.AdManagerAdView
+import org.prebid.mobile.BannerAdUnit
+import org.prebid.mobile.ResultCode
+import org.prebid.mobile.TargetingParams
+
+class PrebidBannerFragment : Fragment() {
+
+    companion object {
+        private const val GAM_AD_UNIT_ID = "/21808260008/prebid_demo_app_original_api_banner"
+        private const val PREBID_CONFIG_ID = "prebid-demo-banner-320-50"
+        private const val WIDTH = 320
+        private const val HEIGHT = 50
+    }
+
+    private lateinit var adView: AdManagerAdView
+    private lateinit var prebidAdUnit: BannerAdUnit
+
+    private lateinit var optable: OptableSDK
+
+    private lateinit var adContainer: ViewGroup
+    private lateinit var statusTextView: TextView
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        val root = inflater.inflate(R.layout.fragment_prebid, container, false)
+        initUi(root)
+        optable = TheApplication.optable
+        return root
+    }
+
+    private fun initUi(root: View) {
+        statusTextView = root.findViewById(R.id.statusTextView)
+        adContainer = root.findViewById(R.id.adContainer)
+
+        root.findViewById<Button>(R.id.btnLoadBanner).setOnClickListener { onClickLoadAd() }
+        root.findViewById<Button>(R.id.btnCachedBanner).setOnClickListener { onClickCachedBanner() }
+        root.findViewById<Button>(R.id.btnClearCache).setOnClickListener { onClickClearCache() }
+    }
+
+    /**
+     * Loads targeting data and then the GAM banner.
+     */
+    private fun onClickLoadAd() {
+        statusTextView.text = ""
+
+        val ids = OptableIdentifiers(email = "test@test.com")
+        optable.targeting(ids) { result ->
+            val optableTargeting = when (result) {
+                is OptableResult.Success<OptableTargeting> -> {
+                    changeStatusText("Targeting success: ${result.data.audiences}")
+                    result.data
+                }
+
+                is OptableResult.Error -> {
+                    changeStatusText("Targeting error: ${result.message}")
+                    null
+                }
+            }
+
+            loadPrebidAd(optableTargeting)
+
+            profile()
+            witness()
+        }
+    }
+
+    private fun loadPrebidAd(optableTargeting: OptableTargeting?) {
+        prebidAdUnit = BannerAdUnit(PREBID_CONFIG_ID, WIDTH, HEIGHT)
+        applyOptableToPrebid(optableTargeting)
+
+        val requestBuilder = AdManagerAdRequest.Builder()
+        prebidAdUnit.fetchDemand(requestBuilder) { resultCode: ResultCode? ->
+            appendStatusText("Prebid ads loading status: $resultCode")
+            loadGamAd(requestBuilder, optableTargeting)
+        }
+    }
+
+    private fun loadGamAd(requestBuilder: AdManagerAdRequest.Builder, optableTargeting: OptableTargeting?) {
+        adContainer.removeAllViews()
+
+        applyOptableToGam(requestBuilder, optableTargeting)
+
+        adView = AdManagerAdView(requireContext())
+        adView.setAdSizes(AdSize(WIDTH, HEIGHT))
+        adView.adUnitId = GAM_AD_UNIT_ID
+        adView.adListener = object : AdListener() {
+            override fun onAdLoaded() {
+                super.onAdLoaded()
+                appendStatusText("Google ad loaded")
+            }
+
+            override fun onAdFailedToLoad(loadAdError: LoadAdError) {
+                appendStatusText("Google ad failed to load: " + loadAdError.message)
+            }
+        }
+        adView.loadAd(requestBuilder.build())
+
+        adContainer.addView(adView)
+    }
+
+
+    /**
+     * Loads cached targeting and then the GAM banner.
+     */
+    private fun onClickCachedBanner() {
+        val targeting = optable.targetingFromCache()
+        if (targeting != null) {
+            changeStatusText("Targeting from cache: ${targeting.audiences}")
+        } else {
+            changeStatusText("Targeting data cache empty.")
+        }
+
+        loadPrebidAd(targeting)
+
+        profile()
+        witness()
+    }
+
+    /**
+     * Clears the targeting data cache.
+     */
+    private fun onClickClearCache() {
+        changeStatusText("Cleared targeting data cache.")
+        optable.targetingClearCache()
+    }
+
+
+    private fun applyOptableToPrebid(targeting: OptableTargeting?) {
+        if (targeting == null) {
+            TargetingParams.setGlobalOrtbConfig(null)
+            return
+        }
+
+        val openRtbJson = targeting.openRtbJson
+        if (openRtbJson?.isNotBlank() == true) {
+            TargetingParams.setGlobalOrtbConfig(openRtbJson)
+        }
+    }
+
+    private fun applyOptableToGam(builder: AdManagerAdRequest.Builder, targeting: OptableTargeting?) {
+        if (targeting == null) return
+
+        val audiences = targeting.audiences
+        if (audiences != null) {
+            for (entry in audiences.entries) {
+                builder.addCustomTargeting(entry.key, entry.value)
+            }
+        }
+    }
+
+    private fun profile() {
+        val traits = hashMapOf<String, Any>("gender" to "F", "age" to 38, "hasAccount" to true)
+        optable.profile(traits) { result ->
+            when (result) {
+                is OptableResult.Success -> {
+                    appendStatusText("Profile success")
+                }
+
+                is OptableResult.Error -> {
+                    appendStatusText("Profile error: ${result.message}")
+                }
+            }
+        }
+    }
+
+    private fun witness() {
+        val properties = hashMapOf<String, Any>("exampleKey" to "exampleValue", "anotherExample" to 123, "foo" to false)
+        optable.witness("GAMBannerFragment.loadAdButtonClicked", properties) { result ->
+            when (result) {
+                is OptableResult.Success -> {
+                    appendStatusText("Witness success")
+                }
+
+                is OptableResult.Error -> {
+                    appendStatusText("Witness error: ${result.message}")
+                }
+            }
+        }
+    }
+
+
+    private fun changeStatusText(message: String) {
+        statusTextView.text = message
+    }
+
+    private fun appendStatusText(message: String) {
+        statusTextView.append("\n\n$message")
+    }
+
+}
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/layout/activity_main.xml b/DemoApp/DemoAppKotlin/app/src/main/res/layout/activity_main.xml
index 38c0aa8..472e2b8 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/res/layout/activity_main.xml
+++ b/DemoApp/DemoAppKotlin/app/src/main/res/layout/activity_main.xml
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="?attr/actionBarSize">
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/bottom_nav_menu" />
+    android:orientation="vertical"
+    android:layout_height="match_parent">
 
     <fragment
         android:id="@+id/nav_host_fragment"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@id/nav_view"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/mobile_navigation" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/windowBackground"
+        app:menu="@menu/bottom_nav_menu" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_gambanner.xml b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_gambanner.xml
index 7b70e92..4ef0fcd 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_gambanner.xml
+++ b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_gambanner.xml
@@ -1,10 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.GAMBanner.GAMBannerFragment">
+    android:orientation="vertical"
+    tools:context=".ui.GamBannerFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btnLoadBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Load Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnCachedBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Cached Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnClearCache"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Clear Cache"
+            android:textSize="8sp" />
+
+    </LinearLayout>
 
     <com.google.android.gms.ads.admanager.AdManagerAdView
         android:id="@+id/publisherAdView"
@@ -14,55 +49,20 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="84dp"
         app:adSize="BANNER"
-        app:adUnitId="/22081946781/android-sdk-demo/mobile-leaderboard"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.494"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:adUnitId="/22081946781/android-sdk-demo/mobile-leaderboard" />
 
-    <Button
-        android:id="@+id/btnLoadAd"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="8dp"
-        android:text="Load Banner"
-        android:textSize="8sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.054"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/btnCachedBanner"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="8dp"
-        android:text="Cached Banner"
-        android:textSize="8sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:padding="8dp"
+        android:layout_weight="1">
 
-    <Button
-        android:id="@+id/btnClearCache"
-        android:layout_width="120dp"
-        android:layout_height="50dp"
-        android:layout_marginTop="8dp"
-        android:text="Clear Cache"
-        android:textSize="8sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.945"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/statusTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
-    <TextView
-        android:id="@+id/targetingDataView"
-        android:layout_width="281dp"
-        android:layout_height="366dp"
-        android:layout_marginTop="100dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btnLoadAd" />
+    </ScrollView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_identify.xml b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_identify.xml
index 3a3f9fb..e33f755 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_identify.xml
+++ b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_identify.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.Identify.IdentifyFragment">
+    android:paddingTop="50dp"
+    tools:context=".ui.IdentifyFragment">
 
     <EditText
         android:id="@+id/editTextTextEmailAddress"
         android:layout_width="350dp"
         android:layout_height="60dp"
         android:ems="10"
+        android:text="test@test.com"
         android:inputType="textEmailAddress"
         android:hint="Email address"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_prebid.xml b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_prebid.xml
new file mode 100644
index 0000000..c040af2
--- /dev/null
+++ b/DemoApp/DemoAppKotlin/app/src/main/res/layout/fragment_prebid.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.PrebidBannerFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btnLoadBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Load Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnCachedBanner"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Cached Banner"
+            android:textSize="8sp" />
+
+        <Button
+            android:id="@+id/btnClearCache"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="Clear Cache"
+            android:textSize="8sp" />
+
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:padding="8dp"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/statusTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </ScrollView>
+
+    <LinearLayout
+        android:id="@+id/adContainer"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:orientation="vertical" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/menu/bottom_nav_menu.xml b/DemoApp/DemoAppKotlin/app/src/main/res/menu/bottom_nav_menu.xml
index 57f2053..897adf3 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/DemoApp/DemoAppKotlin/app/src/main/res/menu/bottom_nav_menu.xml
@@ -4,11 +4,16 @@
     <item
         android:id="@+id/navigation_identify"
         android:icon="@drawable/ic_identify_black"
-        android:title="@string/identify_api" />
+        android:title="Identify API" />
 
     <item
         android:id="@+id/navigation_gambanner"
         android:icon="@drawable/ic_gambanner_black_24dp"
-        android:title="@string/gam_banner" />
+        android:title="GAM Banner" />
+
+    <item
+        android:id="@+id/navigation_prebid"
+        android:icon="@drawable/ic_gambanner_black_24dp"
+        android:title="Prebid Banner" />
 
 </menu>
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/app/src/main/res/navigation/mobile_navigation.xml b/DemoApp/DemoAppKotlin/app/src/main/res/navigation/mobile_navigation.xml
index 0ba442b..819b5c6 100644
--- a/DemoApp/DemoAppKotlin/app/src/main/res/navigation/mobile_navigation.xml
+++ b/DemoApp/DemoAppKotlin/app/src/main/res/navigation/mobile_navigation.xml
@@ -7,14 +7,20 @@
 
     <fragment
         android:id="@+id/navigation_identify"
-        android:name="co.optable.androidsdkdemo.ui.Identify.IdentifyFragment"
-        android:label="@string/title_identify"
+        android:name="co.optable.androidsdkdemo.ui.IdentifyFragment"
+        android:label="Identify API"
         tools:layout="@layout/fragment_identify" />
 
     <fragment
         android:id="@+id/navigation_gambanner"
-        android:name="co.optable.androidsdkdemo.ui.GAMBanner.GAMBannerFragment"
-        android:label="@string/title_gambanner"
+        android:name="co.optable.androidsdkdemo.ui.GamBannerFragment"
+        android:label="GAM Banner"
         tools:layout="@layout/fragment_gambanner" />
 
+    <fragment
+        android:id="@+id/navigation_prebid"
+        android:name="co.optable.androidsdkdemo.ui.PrebidBannerFragment"
+        android:label="Prebid Banner"
+        tools:layout="@layout/fragment_prebid" />
+
 </navigation>
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/gradle.properties b/DemoApp/DemoAppKotlin/gradle.properties
index 4d15d01..6ca214b 100644
--- a/DemoApp/DemoAppKotlin/gradle.properties
+++ b/DemoApp/DemoAppKotlin/gradle.properties
@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+useReleaseSdk=false
\ No newline at end of file
diff --git a/DemoApp/DemoAppKotlin/settings.gradle b/DemoApp/DemoAppKotlin/settings.gradle
index 913b5de..268b821 100644
--- a/DemoApp/DemoAppKotlin/settings.gradle
+++ b/DemoApp/DemoAppKotlin/settings.gradle
@@ -16,4 +16,9 @@ dependencyResolutionManagement {
 }
 
 include ':app'
+includeBuild("../..") {
+    dependencySubstitution {
+        substitute(module("co.optable:local-sdk")).using(project(":android_sdk"))
+    }
+}
 rootProject.name = "DemoKotlin"
\ No newline at end of file
diff --git a/README.md b/README.md
index d07da2c..4032091 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,26 @@
 # Optable Android SDK [![](https://jitci.com/gh/Optable/optable-android-sdk/svg)](https://jitci.com/gh/Optable/optable-android-sdk)
 
-Kotlin SDK for integrating with an [Optable Data Connectivity Node (DCN)](https://docs.optable.co) from an Android application.
+Kotlin SDK for integrating with an [Optable Data Connectivity Node (DCN)](https://docs.optable.co) from an Android
+application.
 
 ## Contents
 
 - [Installing](#installing)
 - [Using](#using)
-  - [Identify API](#identify-api)
-  - [Profile API](#profile-api)
-  - [Targeting API](#targeting-api)
-  - [Witness API](#witness-api)
-  - [Integrating GAM360](#integrating-gam360)
-- [Identifying visitors arriving from Email newsletters](#identifying-visitors-arriving-from-email-newsletters)
-  - [Insert oeid into your Email newsletter template](#insert-oeid-into-your-email-newsletter-template)
-  - [Capture clicks on deep links in your application](#capture-clicks-on-deep-links-in-your-application)
-  - [Call tryIdentifyFromURI SDK API](#call-tryidentifyfromuri-sdk-api)
+    - [Identify API](#identify-api)
+    - [Profile API](#profile-api)
+    - [Targeting API](#targeting-api)
+    - [Witness API](#witness-api)
+    - [Integrating GAM](#integrating-google-ad-manager)
+    - [Identify from URL](#identify-from-url)
+- [Consents](#consents)
 - [Demo Applications](#demo-applications)
-  - [Building](#building)
+    - [Building](#building)
 
 ## Installing
 
-This SDK is published using [JitPack](https://jitpack.io/), so to add it to your application build, follow the [JitPack How To](https://jitpack.io/).
-
-If you're using gradle, add the following in your root `build.gradle` at the end of `repositories`:
+This SDK is published using [JitPack](https://jitpack.io/), so you need to add the repository to your application build.
+Add the following in your root `build.gradle` at the end of `repositories`:
 
 ```kotlin
 allprojects {
@@ -43,476 +41,577 @@ dependencies {
 }
 ```
 
-Remember to replace `VERSION_TAG` with the latest or desired [SDK release](https://github.com/Optable/optable-android-sdk/releases).
+Replace `VERSION_TAG` with the latest or desired [SDK release](https://github.com/Optable/optable-android-sdk/releases).
 
 ## Using
 
-To configure an instance of the SDK integrating with an [Optable](https://optable.co/) DCN running at hostname `dcn.customer.com`, from a configured application origin identified by slug `my-app`, you can instantiate the SDK from an Activity or Application `Context`, such as for example the following application `MainActivity`:
+To create the instance of the `OptableSDK` you have to create `OptableConfig` with the required parameters. 
+- `providedContext` Android Context (Application or Activity).
+- `tenant` The tenant name associated with the configuration. E.g. `acmeco.optable.co` => `acmeco`.
+- `originSlug` The DCN's Source Slug. E.g. `acmeco-sdk`.
+
+### Creating instance
 
 #### Kotlin
 
 ```kotlin
-import co.optable.android_sdk.OptableSDK
-...
+class TheApplication : Application() {
+
+  companion object {
+    lateinit var optable: OptableSDK
+  }
+
+  override fun onCreate() {
+    super.onCreate()
+
+    val config = OptableConfig(
+      providedContext = this,
+      tenant = "prebidtest",
+      originSlug = "js-sdk",
+    )
+    optable = OptableSDK(config)
+  }
 
-class MainActivity : AppCompatActivity() {
-    companion object {
-        var OPTABLE: OptableSDK? = null
-    }
-    ...
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        ...
-        MainActivity.OPTABLE = OptableSDK(this, "dcn.customer.com", "my-app")
-        ...
-    }
 }
 ```
 
 #### Java
 
 ```java
-import co.optable.android_sdk.OptableSDK;
-...
+public class TheApplication extends Application {
+
+  public static OptableSDK optable;
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+
+    OptableConfig config = new OptableConfig(this, "prebidtest", "js-sdk");
+    optable = new OptableSDK(config);
+  }
 
-public class MainActivity extends AppCompatActivity {
-    public static OptableSDK OPTABLE;
-    ...
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        ...
-        MainActivity.OPTABLE = new OptableSDK(this.getApplicationContext(),
-                                              "dcn.customer.com", "my-app");
-        ...
-    }
 }
 ```
 
-You can then call various SDK APIs on the instance as shown in the examples below. It's also possible to configure multiple instances of `OptableSDK` in order to connect to other (e.g., partner) DCNs and/or reference other configured application slug IDs.
+Additionally, you can set optional parameters to `OptableConfig`:
+- `host` The hostname of the Optable endpoint. Default value is "na.edge.optable.co".
+- `path` The API path to be appended to the host. Default value is "v2".
+- `insecure` Boolean flag that determines if insecure HTTP should be used instead of HTTPS. Default is false. Note 
+that production DCNs only listen to TLS traffic. The `insecure: true` option is meant to be used by Optable 
+developers running the DCN locally for testing.
+- `apiKey` An optional API key for authentication. If the API Endpoint is enabled as private, a Service Account API key will be required.
+- `customUserAgent` An optional custom user agent string for network requests.
+- `skipAdvertisingIdDetection` Boolean flag to skip the detection of advertising IDs. Default is false.
+- `consents` Optional `OptableConsents` object for providing custom consent information. If not provided, default values will be used.
+
+```kotlin
+val config = OptableConfig(
+    providedContext = this,
+    tenant = "prebidtest",
+    originSlug = "js-sdk",
+    host = "ca.edge.optable.co",
+    path = "v2",
+    insecure = false,
+    apiKey = API_KEY,
+    customUserAgent = "",
+    skipAdvertisingIdDetection = false,
+    consents = OptableConsents(),
+)
+```
 
-Note that all SDK communication with Optable DCNs is done over TLS. The only exception to this is if you instantiate the `OptableSDK` class with a fourth optional boolean parameter, `insecure`, set to `true`. For example, in Kotlin:
+You can then call various SDK APIs on the instance as shown in the examples below. It's also possible to configure
+multiple instances of `OptableSDK` in order to connect to other (e.g., partner) DCNs and/or reference other configured
+application slug IDs.
+
+By default, the SDK detects the application user agent by sniffing `settings.userAgentString` from a `WebView`. The
+resulting user agent string is sent to your DCN for analytics purposes. To disable this behavior, you can provide an
+optional fifth string parameter `customUserAgent`, which allows you to set whatever user agent string you would like to send
+instead. For example, in Kotlin:
 
 ```kotlin
-MainActivity.OPTABLE = OptableSDK(this, "dcn.customer.com", "my-app", true)
+val config = OptableConfig(
+  ...
+  customUserAgent = "Chromium WebView",
+)
+```
+
+Finally, an optional sixth boolean parameter `skipAdvertisingIdDetection` can be used to skip any ID info detection from
+`AdvertisingIdClient` which by default runs in a background co-routine. Disabling ad ID detection means that the SDK
+will not be able to automatically obtain the Google Advertising ID. For example, to disable ad ID detection, in Kotlin:
+
+```kotlin
+val config = OptableConfig(
+  ...
+  skipAdvertisingIdDetection = true,
+)
 ```
 
-Note that production DCNs only listen to TLS traffic. The `insecure: true` option is meant to be used by Optable developers running the DCN locally for testing.
+### OptableIdentifiers
 
-By default, the SDK detects the application user agent by sniffing `settings.userAgentString` from a `WebView`. The resulting user agent string is sent to your DCN for analytics purposes. To disable this behavior, you can provide an optional fifth string parameter `useragent`, which allows you to set whatever user agent string you would like to send instead. For example, in Kotlin:
+There are many fields to identify the users. You can provide any user information using `OptableIdentifiers` class. 
+Sensitive data as email and phone number encrypted using SHA256. 
+
+**NOTE**: You don't need to provide all fields. Only the fields that you have are required.
+
+> :warning: **Client-side email and phone hashing**: The SDK will compute the SHA-256 hash of the sensitive information on the client-side
+> and send the hashed value to the DCN. The email address and phone number is **not** sent by the device in plain text.
+
+#### Kotlin
 
 ```kotlin
-MainActivity.OPTABLE = OptableSDK(this, "dcn.customer.com", "my-app", false, "custom-ua")
+val ids = OptableIdentifiers(
+    email = "john.doe+test@example.com",
+    phoneNumber = "+1(555)1234567",
+    postalCode = "12345",
+    ipv4Address = "192.168.0.1",
+    ipv6Address = "2001:db8::1",
+    appleIdfa = "a1b2c3d4-e5f6-7890-abcd-ef0123456789",
+    googleGaid = "38400000-8cf0-11bd-b23e-10b96e40000d",
+    rokuRida = "roku-rida-123",
+    samsungTifa = "tifaabc",
+    amazonFireAfai = "afaixyz",
+    netId = "netid123",
+    id5 = "id5token",
+    utiq = "utiqvalue",
+    custom = mapOf(
+        "v" to "vidvalue",
+        "c1" to "custom one"
+    ),
+    raw = listOf("raw:alreadyEncoded", "ultra:someRawValue")
+)
 ```
 
-Finally, an optional sixth boolean parameter `skipAdvertisingIdDetection` can be used to skip any ID info detection from `AdvertisingIdClient` which by default runs in a background co-routine. Disabling ad ID detection means that the SDK will not be able to automatically obtain the Google Advertising ID. For example, to disable ad ID detection, in Kotlin:
+#### Java
+
+You can use the Builder pattern for Java implementation. 
+
+```java
+OptableIdentifiers ids = new OptableIdentifiers.Builder()
+        .email("john.doe+test@example.com")
+        .phoneNumber("+1(555)1234567")
+        .postalCode("12345")
+        .ipv4Address("192.168.0.1")
+        .ipv6Address("2001:db8::1")
+        .appleIdfa("a1b2c3d4-e5f6-7890-abcd-ef0123456789")
+        .googleGaid("38400000-8cf0-11bd-b23e-10b96e40000d")
+        .rokuRida("roku-rida-123")
+        .samsungTifa("tifaabc")
+        .amazonFireAfai("afaixyz")
+        .netId("netid123")
+        .id5("id5token")
+        .utiq("utiqvalue")
+        .custom(Map.of("v", "vidvalue", "c1", "custom one"))
+        .raw(List.of("raw:alreadyEncoded", "ultra:someRawValue"))
+        .build();
+```
+
+Additionally, you can set automatic fetching GAID if it is available. It will be ignored if `googleGaid` is set. 
 
 ```kotlin
-MainActivity.OPTABLE = OptableSDK(this, "dcn.customer.com", "my-app", false, null, true)
+val ids = OptableIdentifiers(
+    receiveGaidAutomatically = true
+)
 ```
 
 ### Identify API
 
-To associate a user device with an authenticated identifier such as an Email address, or with other known IDs such as the Google Advertising ID, or even your own vendor or app level `PPID`, you can call the `identify` API as follows:
+To associate a user device with an authenticated identifier such as an Email address, or with other known IDs such as
+the Google Advertising ID, or even your own vendor or app level `PPID`, you can call the `identify` API as follows:
 
 #### Kotlin
 
 ```kotlin
-import co.optable.android_sdk.OptableSDK
-import my.org.app.MainActivity
-import android.util.Log
-...
-
-val emailString = "some.email@address.com"
-val sendGoogleAdIDBoolean = true
-val ppid = "my-id-123"
-
-MainActivity.OPTABLE!!
-    .identify(emailString, sendGoogleAdIDBoolean, ppid)
-    .observe(viewLifecycleOwner, Observer
-    { result ->
-        if (result.status == OptableSDK.Status.SUCCESS) {
-            Log.i("Identify API Success")
-        } else {
-            // result.status is OptableSDK.Status.ERROR
-            // result.message is the error message
-            Log.e("Identify API Error: ${result.message}")
-        }
-    })
+val ids = OptableIdentifiers(
+  email = "some.email@address.com",
+  raw = listOf("c:my-id-123")
+)
+optable.identify(ids) { result ->
+  val msg = when (result) {
+    is OptableResult.Success -> "Identify success"
+    is OptableResult.Error -> "Identify error: ${result.message}"
+  }
+  Log.d(TAG, msg)
+}
 ```
 
 #### Java
 
 ```java
-import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
-import android.util.Log;
-...
-
-String emailString = "some.email@address.com";
-Boolean sendGoogleAdIDBoolean = true;
-String ppid = "my-id-123";
-
-MainActivity.OPTABLE
-    .identify(emailString, sendGoogleAdIDBoolean, ppid)
-    .observe(getViewLifecycleOwner(), result -> {
-        if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-            Log.i(null, "Identify API Success");
-        } else {
-            // result.getStatus() is OptableSDK.Status.ERROR
-            // result.getMessage() is the error message
-            Log.e(null, "Identify API Error: " + result.getMessage());
-        }
-    });
+OptableIdentifiers ids = new OptableIdentifiers.Builder()
+        .email("some.email@address.com")
+        .raw(Lists.newArrayList("c:my-id-123"))
+        .build();
+optable.identify(ids, result -> {
+    if (result instanceof OptableResult.Success) {
+        Log.d(TAG, "Identify success");
+    } else if (result instanceof OptableResult.Error<Unit> error) {
+        Log.d(TAG, "Identify error: " + error.getMessage());
+    }
+});
 ```
 
-The SDK `identify()` method will asynchronously connect to the configured DCN and send IDs for resolution. The second (`sendGoogleAdIDBoolean`) and third (`ppid`) arguments to `identify()` are optional. You can register an observer to understand successful completion or errors.
+The SDK `identify()` method will asynchronously connect to the configured DCN and send IDs for resolution. You can register an observer to
+understand successful completion or errors. 
+
+The frequency of invocation of `identify` is up to you, however for optimal identity resolution we recommended to call
+the `identify()` method on your SDK instance every time you authenticate a user, as well as periodically, such as for
+example once every 15 to 60 minutes while the application is being actively used and an internet connection is
+available.
 
-> :warning: **Client-Side Email Hashing**: The SDK will compute the SHA-256 hash of the Email address on the client-side and send the hashed value to the DCN. The Email address is **not** sent by the device in plain text.
+Alternatively, you can use simplified identify: 
+
+```kotlin
+optable.identify(email, true, "ppid") { result ->
+    ...
+}
+```
 
-Since the `sendGoogleAdIDBoolean` value provided to `identify()` is `true`, the SDK will fetch and send the Google Advertising ID in the call to `identify` too, unless the user has turned on "Limit ad tracking" in their Google device advertising settings.
+The second (`sendGoogleAdIDBoolean`) and third (`ppid`) arguments to `identify()` are optional. Since the `gaid` value provided to `identify()` is `true`, the SDK will fetch and send the Google
+Advertising ID in the call to `identify` too, unless the user has turned on "Limit ad tracking" in their Google device
+advertising settings.
 
-The frequency of invocation of `identify` is up to you, however for optimal identity resolution we recommended to call the `identify()` method on your SDK instance every time you authenticate a user, as well as periodically, such as for example once every 15 to 60 minutes while the application is being actively used and an internet connection is available.
 
 ### Profile API
 
-To associate key value traits with the user's device, for eventual audience assembly, you can call the profile API as follows:
+To associate key value traits with the user's device, for eventual audience assembly, you can call the profile API as
+follows:
 
 #### Kotlin
 
 ```kotlin
-import co.optable.android_sdk.OptableSDK
-import my.org.app.MainActivity
-import android.util.Log
-...
-MainActivity.OPTABLE!!
-    .profile(hashMapOf("gender" to "F", "age" to 38, "hasAccount" to true))
-    .observe(viewLifecycleOwner, Observer { result ->
-        if (result.status == OptableSDK.Status.SUCCESS) {
-            Log.i("Profile API Success... ")
-        } else {
-            // result.status is OptableSDK.Status.ERROR
-            // result.message is the error message
-            Log.e("Profile API Error: ${result.message}")
-        }
-    })
+val traits = hashMapOf<String, Any>("gender" to "F", "age" to 38, "hasAccount" to true)
+optable.profile(traits) { result ->
+  when (result) {
+    is OptableResult.Success<*> -> {
+      Log.d(TAG, "Profile success")
+    }
+
+    is OptableResult.Error -> {
+      Log.d(TAG, "Profile error: ${result.message}")
+    }
+  }
+}
 ```
 
 #### Java
 
 ```java
-import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
-import android.util.Log;
-import java.util.HashMap;
-...
-HashMap<String,Object> traits = new HashMap<String,Object>();
+HashMap<String, Object> traits = new HashMap<>();
 traits.put("gender", "F");
 traits.put("age", 38);
 traits.put("hasAccount", true);
 
-MainActivity.OPTABLE
-    .profile(traits)
-    .observe(getViewLifecycleOwner(), result -> {
-        if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-            Log.i(null, "Profile API Success... ");
-        } else {
-            // result.getStatus() is OptableSDK.Status.ERROR
-            // result.getMessage() is the error message
-            Log.e(null, "Profile API Error: " + result.getMessage());
-        }
-    });
+optable.profile(traits, result -> {
+    if (result instanceof OptableResult.Success) {
+        Log.d(TAG, "Profile success");
+    } else if (result instanceof OptableResult.Error<Unit> error) {
+        Log.d(TAG, "Profile error: " + error.getMessage());
+    }
+});
 ```
 
-The specified traits are associated with the user's device and can be used for matching during audience assembly. The traits are of type `OptableProfileTraits` which is an alias for `HashMap<String,Any>` (or `HashMap<String,Object>` in Java), and should consist only of key-value pairs where the key is a string and the value is either a string, number, or boolean.
+The specified traits are associated with the user's device and can be used for matching during audience assembly. The
+traits are of type `HashMap<String, Any>`, and should consist only of key-value pairs where the key is a string and the value is either a string, number, or
+boolean.
 
 ### Targeting API
 
-To get the targeting key values associated by the configured DCN with the device in real-time, you can call the `targeting` API as follows:
+To get the targeting key values associated by the configured DCN with the device in real-time, you can call the
+`targeting` API as follows:
 
 #### Kotlin
 
 ```kotlin
-import co.optable.android_sdk.OptableSDK
-import my.org.app.MainActivity
-import android.util.Log
-...
-MainActivity.OPTABLE!!
-    .targeting()
-    .observe(viewLifecycleOwner, Observer { result ->
-        if (result.status == OptableSDK.Status.SUCCESS) {
-            Log.i("Targeting API Success... ")
-
-            // result.data!! can be iterated to get targeting key values:
-            result.data!!.forEach { (key, values) ->
-                Log.i("Targeting KV: ${key} = ${values}")
+val ids = OptableIdentifiers(email = "test@test.com")
+optable.targeting(ids) { result ->
+    val requestBuilder = AdManagerAdRequest.Builder()
+
+    when (result) {
+        is OptableResult.Success<OptableTargeting> -> {
+            val audiences = result.data.audiences
+            if (audiences != null) {
+                // Apply 
             }
-        } else {
-            // result.status is OptableSDK.Status.ERROR
-            // result.message is the error message
-            Log.e("Targeting API Error: ${result.message}")
         }
-    })
+
+        is OptableResult.Error<OptableTargeting> -> {
+            Log.d(TAG, "Targeting error: ${result.message}")
+        }
+    }
+}
 ```
 
 #### Java
 
 ```java
-import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
-import android.util.Log;
-...
-MainActivity.OPTABLE
-    .targeting()
-    .observe(getViewLifecycleOwner(), result -> {
-        if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-            Log.i(null, "Targeting API Success... ");
-
-            result.getData().forEach((key, values) -> {
-                Log.i(null, "Targeting KV: " + key.toString() + " = " + values.toString());
-            });
-        } else {
-            // result.getStatus() is OptableSDK.Status.ERROR
-            // result.getMessage() is the error message
-            Log.e(null, "Targeting API Error: " + result.getMessage());
+OptableIdentifiers ids = new OptableIdentifiers.Builder().email("test@test.com").build();
+optable.targeting(ids, result -> {
+    if (result instanceof OptableResult.Success<OptableTargeting> success) {
+        Map<String, List<String>> audiences = success.getData().getAudiences();
+        if (audiences != null) {
+            // Apply
         }
-    });
+    } else if (result instanceof OptableResult.Error<OptableTargeting> error) {
+        Log.d(TAG, "Targeting error: " + error.getMessage());
+    }
+})    
 ```
 
-On success, the resulting key values are typically sent as part of a subsequent ad call. Therefore we recommend that you either call `targeting()` before each ad call, or in parallel periodically, caching the resulting key values which you then provide in ad calls.
+On success, the resulting key values are typically sent as part of a subsequent ad call. Therefore we recommend that you
+either call `targeting()` before each ad call, or in parallel periodically, caching the resulting key values which you
+then provide in ad calls.
 
 #### Caching Targeting Data
 
-The `targeting` API will automatically cache resulting key value data in client storage on success. You can subsequently retrieve the cached key value data as follows:
+The `targeting` API will automatically cache resulting key value data in client storage on success. You can subsequently
+retrieve the cached key value data as follows:
 
 ##### Kotlin
 
 ```kotlin
-var cachedTargetingData = MainActivity.OPTABLE!!.targetingFromCache()
-if (cachedTargetingData != null) {
-  cachedTargetingData!!.forEach { (key, values) ->
-    // key is a String and values is a List<String> ...
-  }
+val targeting = optable.targetingFromCache()
+if (targeting != null) {
+    // Apply
 }
 ```
 
 ##### Java
 
 ```java
-HashMap<String, List<String>> cachedTargetingData = MainActivity.OPTABLE.targetingFromCache();
-if (cachedTargetingData != null) {
-  cachedTargetingData.forEach((key, values) -> {
-    // key is a String and values is a List<String> ...
-  });
+OptableTargeting optableTargeting = optable.targetingFromCache();
+if (optableTargeting != null) {
+    // Apply
 }
 ```
 
 You can also clear the locally cached targeting data:
 
-##### Kotlin
-
 ```kotlin
-MainActivity.OPTABLE!!.targetingClearCache()
-```
-
-##### Java
-
-```java
-MainActivity.OPTABLE.targetingClearCache();
+optable.targetingClearCache()
 ```
 
 Note that both `targetingFromCache()` and `targetingClearCache()` are synchronous.
 
 ### Witness API
 
-To send real-time event data from the user's device to the DCN for eventual audience assembly, you can call the witness API as follows:
+To send real-time event data from the user's device to the DCN for eventual audience assembly, you can call the witness
+API as follows:
 
 #### Kotlin
 
 ```kotlin
-import co.optable.android_sdk.OptableSDK
-import my.org.app.MainActivity
-import android.util.Log
-...
-MainActivity.OPTABLE!!
-    .witness("example.event.type", hashMapOf("exampleKey" to "exampleValue"))
-    .observe(viewLifecycleOwner, Observer { result ->
-        if (result.status == OptableSDK.Status.SUCCESS) {
-            Log.i("Witness API Success... ")
-        } else {
-            // result.status is OptableSDK.Status.ERROR
-            // result.message is the error message
-            Log.e("Witness API Error: ${result.message}")
-        }
-    })
+optable.witness(
+  "GAMBannerFragment.loadAdButtonClicked",
+  hashMapOf("exampleKey" to "exampleValue", "anotherExample" to 123, "foo" to false)
+) { result ->
+  when (result) {
+    is OptableResult.Success<*> -> {
+      Log.d(TAG, "Witness success")
+    }
+
+    is OptableResult.Error -> {
+      Log.d(TAG, "Witness error: ${result.message}")
+    }
+  }
+}
 ```
 
 #### Java
 
 ```java
-import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
-import android.util.Log;
-import java.util.HashMap;
-...
-HashMap<String,Object> eventProperties = new HashMap<String,Object>();
+HashMap<String, Object> eventProperties = new HashMap<>();
 eventProperties.put("exampleKey", "exampleValue");
-
-MainActivity.OPTABLE
-    .witness("example.event.type", eventProperties)
-    .observe(getViewLifecycleOwner(), result -> {
-        if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-            Log.i(null, "Witness API Success... ");
-        } else {
-            // result.getStatus() is OptableSDK.Status.ERROR
-            // result.getMessage() is the error message
-            Log.e(null, "Witness API Error: " + result.getMessage());
-        }
-    });
+eventProperties.put("exampleKey2", 123);
+eventProperties.put("exampleKey3", false);
+
+optable.witness("GAMBannerFragment.loadAdButtonClicked", eventProperties, result -> {
+    if (result instanceof OptableResult.Success) {
+        Log.d(TAG, "Witness success");
+    } else if (result instanceof OptableResult.Error<Unit> error) {
+        Log.d(TAG, "Witness error: " + error.getMessage());
+    }
+});
 ```
 
-The specified event type and properties are associated with the logged event and which can be used for matching during audience assembly. The optional witness event properties are of type `OptableWitnessProperties` which is an alias for `HashMap<String,Any>` (or `HashMap<String,Object>` in Java), and should consist only of key-value pairs where the key is a string and the value is either a string, number, or boolean.
+The specified event type and properties are associated with the logged event and which can be used for matching during
+audience assembly. The optional witness event properties are of type `HashMap<String, Any>`, and should consist only of key-value pairs where the key is
+a string and the value is either a string, number, or boolean.
 
-### Integrating GAM360
+### Integrating Google Ad Manager
 
-We can further extend the above `targeting` example to show an integration with a [Google Ad Manager 360](https://admanager.google.com/home/) ad server account:
+We can further extend the above `targeting` example to show an integration with
+a [Google Ad Manager](https://admanager.google.com/home/) ad server account:
 
 #### Kotlin
 
 ```kotlin
-import co.optable.android_sdk.OptableSDK
-import my.org.app.MainActivity
-import android.util.Log
-import com.google.android.gms.ads.doubleclick.PublisherAdRequest
-import com.google.android.gms.ads.doubleclick.PublisherAdView
-...
-MainActivity.OPTABLE!!
-    .targeting()
-    .observe(viewLifecycleOwner, Observer { result ->
-        // Build GAM360 ad request:
-        var adRequest = PublisherAdRequest.Builder()
-
-        if (result.status == OptableSDK.Status.SUCCESS) {
-            Log.i("Targeting API Success... ")
-
-            // result.data!! can be iterated to get targeting key values:
-            result.data!!.forEach { (key, values) ->
-                // Add key values to GAM360 ad request:
-                adRequest.addCustomTargeting(key, values)
-                Log.i("Targeting KV: ${key} = ${values}")
-            }
-        } else {
-            // result.status is OptableSDK.Status.ERROR
-            // result.message is the error message
-            Log.e("Targeting API Error: ${result.message}")
-        }
+private lateinit var optable: OptableSDK
+
+private fun onClickLoadAd() {
+  val ids = OptableIdentifiers(email = "test@test.com")
+  optable.targeting(ids) { result ->
+    val requestBuilder = AdManagerAdRequest.Builder()
+
+    when (result) {
+      is OptableResult.Success<OptableTargeting> -> {
+        applyOptableToGam(requestBuilder, result.data)
+      }
 
-        // Assuming pubAdView refers to a pre-configured instance of
-        // com.google.android.gms.ads.doubleclick.PublisherAdView:
-        pubAdView.loadAd(adRequest.build())
-    })
+      is OptableResult.Error<OptableTargeting> -> {
+        Log.d(TAG, "Targeting error: ${result.message}")
+      }
+    }
+
+    adView.loadAd(requestBuilder.build())
+  }
+}
+
+private fun applyOptableToGam(builder: AdManagerAdRequest.Builder, targeting: OptableTargeting?) {
+  if (targeting == null) return
+
+  val audiences = targeting.audiences
+  if (audiences != null) {
+    for (entry in audiences.entries) {
+      builder.addCustomTargeting(entry.key, entry.value)
+    }
+  }
+}
 ```
 
 #### Java
 
 ```java
-import co.optable.android_sdk.OptableSDK;
-import co.optable.demoappjava.MainActivity;
-import android.util.Log;
-import com.google.android.gms.ads.doubleclick.PublisherAdRequest;
-import com.google.android.gms.ads.doubleclick.PublisherAdView;
-...
-MainActivity.OPTABLE.targeting().observe(getViewLifecycleOwner(), result -> {
-    // Build GAM360 ad request:
-    PublisherAdRequest.Builder adRequest = new PublisherAdRequest.Builder();
-
-    if (result.getStatus() == OptableSDK.Status.SUCCESS) {
-        Log.i(null, "Targeting API Success... ");
-
-        // result.getData() can be iterated to get targeting key values:
-        result.getData().forEach((key, values) -> {
-            // Add key values to GAM360 ad request:
-            adRequest.addCustomTargeting(key, values);
-            Log.i(null, "Targeting KV: " + key.toString() + " = " + values.toString());
-        });
-    } else {
-        // result.getStatus() is OptableSDK.Status.ERROR
-        // result.getMessage() is the error message
-        Log.e(null, "Targeting API Error: " + result.getMessage());
+    private AdManagerAdView mAdView;
+
+    private void onClickLoadAd() {
+      OptableIdentifiers ids = new OptableIdentifiers.Builder().email("test@test.com").build();
+      optable.targeting(ids, result -> {
+        AdManagerAdRequest.Builder requestBuilder = new AdManagerAdRequest.Builder();
+    
+        if (result instanceof OptableResult.Success<OptableTargeting> success) {
+          applyOptableToGam(requestBuilder, success.getData());
+        } else if (result instanceof OptableResult.Error<OptableTargeting> error) {
+          Log.d(TAG, "Targeting error: " + error.getMessage());
+        }
+        mAdView.loadAd(requestBuilder.build());
+      });
     }
 
-    // Assuming pubAdView refers to a pre-configured instance of
-    // com.google.android.gms.ads.doubleclick.PublisherAdView:
-    pubAdView.loadAd(adRequest.build());
-});
+    private void applyOptableToGam(AdManagerAdRequest.Builder builder, @Nullable OptableTargeting targeting) {
+      if (targeting == null) return;
+    
+      Map<String, List<String>> audiences = targeting.getAudiences();
+      if (audiences != null) {
+        for (Map.Entry<String, List<String>> entry : audiences.entrySet()) {
+          builder.addCustomTargeting(entry.getKey(), entry.getValue());
+        }
+      }
+    }
 ```
 
 Working examples are available in the Kotlin and Java SDK demo applications.
 
-## Identifying visitors arriving from Email newsletters
+## Identify from URL
 
-If you send Email newsletters that contain links to your application (e.g., deep links), then you may want to automatically _identify_ visitors that have clicked on any such links via their Email address. 
+You can identify visitors arriving from Email newsletters. If you send Email newsletters that contain links to your application (e.g., deep links), then you may want to
+automatically _identify_ visitors that have clicked on any such links via their Email address.
 
 ### Insert oeid into your Email newsletter template
 
-To enable automatic identification of visitors originating from your Email newsletter, you first need to include an **oeid** parameter in the query string of all links to your website in your Email newsletter template. The value of the **oeid** parameter should be set to the SHA256 hash of the lowercased Email address of the recipient. For example, if you are using [Braze](https://www.braze.com/) to send your newsletters, you can easily encode the SHA256 hash value of the recipient's Email address by setting the **oeid** parameter in the query string of any links to your application as follows:
+To enable automatic identification of visitors originating from your Email newsletter, you first need to include an *
+*oeid** parameter in the query string of all links to your website in your Email newsletter template. The value of the *
+*oeid** parameter should be set to the SHA256 hash of the lowercased Email address of the recipient. For example, if you
+are using [Braze](https://www.braze.com/) to send your newsletters, you can easily encode the SHA256 hash value of the
+recipient's Email address by setting the **oeid** parameter in the query string of any links to your application as
+follows:
 
 ```
 oeid={{${email_address} | downcase | sha2}}
 ```
 
-The above example uses various personalization tags as documented in [Braze's user guide](https://www.braze.com/docs/user_guide/personalization_and_dynamic_content/) to dynamically insert the required data into an **oeid** parameter, all of which should make up a _part_ of the destination URL in your template.
+The above example uses various personalization tags as documented
+in [Braze's user guide](https://www.braze.com/docs/user_guide/personalization_and_dynamic_content/) to dynamically
+insert the required data into an **oeid** parameter, all of which should make up a _part_ of the destination URL in your
+template.
 
 ### Capture clicks on deep links in your application
 
-In order for your application to open on devices where it is installed when a link to your domain is clicked, you need to [configure and prepare your application to handle deep links](https://developer.android.com/training/app-links/deep-linking) first.
-
-### Call tryIdentifyFromURI SDK API
-
-When Android launches your app after a user clicks on a link, it will start your app activity with your configured _intent filters_. You can then obtain the `Uri` of the link by calling `getData()`, and pass it to the SDK's `tryIdentifyFromURI()` API which will automatically look for `oeid` in the query parameters of the `Uri` and call `identify` with its value if found.
+In order for your application to open on devices where it is installed when a link to your domain is clicked, you need
+to [configure and prepare your application to handle deep links](https://developer.android.com/training/app-links/deep-linking)
+first.
 
-For example, you can call `getData()` on the incoming `Intent` from your `onCreate()` activity lifecycle callback as follows:
+When Android launches your app after a user clicks on a link, it will start your app activity with your configured
+_intent filters_. You can then obtain the `Uri` of the link by calling `getData()`, and pass it to the SDK's
+`tryIdentifyFromUrl()` API which will automatically look for `oeid` in the query parameters of the `String` and call
+`identify` with its value if found.
 
 #### Kotlin
 
 ```kotlin
-override fun onCreate(savedInstanceState: Bundle?) {
-  super.onCreate(savedInstanceState)
-  setContentView(R.layout.main)
-  ...
-  val data: Uri? = intent?.data
-  if (data != null) {
-    MainActivity.OPTABLE!!.tryIdentifyFromURI(data)
+optable.tryIdentifyFromUrl(url) { result ->
+  val msg = when (result) {
+    is OptableResult.Success -> "Identify success"
+    is OptableResult.Error -> "Identify error: ${result.message}"
   }
-  ...
+  Log.d(TAG, msg)
 }
 ```
 
 #### Java
 
 ```java
-@Override
-public void onCreate(Bundle savedInstanceState) {
-  super.onCreate(savedInstanceState);
-  setContentView(R.layout.main);
-  ...
-  Intent intent = getIntent();
-  Uri data = intent.getData();
-  if (data != null) {
-    MainActivity.OPTABLE.tryIdentifyFromURI(data);
-  }
-  ...
-}
+optable.tryIdentifyFromUrl(url, result -> {
+    if (result instanceof OptableResult.Success) {
+        Log.d(TAG, "Identify success");
+    } else if (result instanceof OptableResult.Error<Unit> error) {
+        Log.d(TAG, "Identify error: " + error.getMessage());
+    }
+});
 ```
 
+## Consents
+
+The SDK supports GDPR, IAB TCF, IAB GPP. You can set the most common consent values like this:
+```kotlin
+val consents = OptableConsents(
+  gdprSubject = true,               // User is in scope of GDPR
+  gdprConsent = "consent-string",   // IAB TCF consent string
+  gpp = "gpp-string",               // IAB GPP string
+  gppSid = "1,2",                   // GPP section IDs (comma-separated)
+  req = "gdpr",                     // Regulatory framework to apply (e.g., "gdpr")
+)
+
+optable.setConsents(consents)
+```
+
+Parameters: 
+- `gdprSubject` A boolean indicating whether GDPR applies. This value should be present when gdpr_consent is supplied.
+If not set, SDK will try to fetch data from SharedPreferences (key `IABTCF_gdprApplies`), as stated in
+[standard](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/TCFv2/IAB%20Tech%20Lab%20-%20CMP%20API%20v2.md#in-app-details)
+- `gdprConsent` TCF EU v2 consent string. If not set, SDK will try to fetch data from SharedPreferences (key `IABTCF_TCString`), as stated in
+[standard](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/TCFv2/IAB%20Tech%20Lab%20-%20CMP%20API%20v2.md#in-app-details).
+- `gpp`  GPP privacy string.
+If not set, SDK will try to fetch data from SharedPreferences (key `IABGPP_2_TCString`), as stated in
+[standard](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/TCFv2/IAB%20Tech%20Lab%20-%20CMP%20API%20v2.md#in-app-details)
+- `gppSid`  A comma-separated list of up to two sections applicable in a given GPP privacy string. This value is required when gpp is present.
+- `req` Optable privacy regulation override, which can be one of: `gdpr`, `can`, `us`, or `null` and will override all other privacy regulations when present.
+
+**NOTE**: The custom values provided to the `OptableConfig` will override all other privacy regulations when present.
+
 ## Demo Applications
 
-The Kotlin and Java demo applications show a working example of `identify`, `targeting`, and `witness` APIs, as well as an integration with the [Google Ad Manager 360](https://admanager.google.com/home/) ad server, enabling the targeting of ads served by GAM360 to audiences activated in the [Optable](https://optable.co/) DCN.
+The Kotlin and Java demo applications show a working example of the APIs, as well as
+an integration with the [Google Ad Manager](https://admanager.google.com/home/) ad server, enabling the targeting of
+ads served by GAM to audiences activated in the [Optable](https://optable.co/) DCN.
 
-By default, the demo applications will connect to the [Optable](https://optable.co/) demo DCN at `sandbox.optable.co` and reference application slug `android-sdk-demo`. The demo apps depend on the [GAM Mobile Ads SDK for Android](https://developers.google.com/ad-manager/mobile-ads-sdk/android/quick-start) and load ads from a GAM360 account operated by [Optable](https://optable.co/).
+By default, the demo applications will connect to the [Optable](https://optable.co/) demo DCN at `sandbox.optable.co`and
+reference application slug `android-sdk-demo`. The demo apps depend on
+the [GAM Mobile Ads SDK for Android](https://developers.google.com/ad-manager/mobile-ads-sdk/android/quick-start) and
+load ads from a GAM account operated by [Optable](https://optable.co/).
 
 ### Building
 
-To build the Kotlin demo app, from [Android Studio](https://developer.android.com/studio), navigate to `File > Open` and open the `DemoApp/DemoAppKotlin` directory. To build the Java demo app, open the `DemoApp/DemoAppJava` directory. In both cases, you should be able to build and run the resulting project directly, since it will automatically download the `co.optable.android_sdk` library from the [JitPack](https://jitpack.io/) Maven repository.
+To build the Kotlin demo app, from [Android Studio](https://developer.android.com/studio), navigate to `File > Open` and
+open the `DemoApp/DemoAppKotlin` directory. To build the Java demo app, open the `DemoApp/DemoAppJava` directory. In
+both cases, you should be able to build and run the resulting project directly, since it will automatically download the
+`co.optable.android_sdk` library from the [JitPack](https://jitpack.io/) Maven repository.
diff --git a/android_sdk/build.gradle b/android_sdk/build.gradle
index 32980ff..6fb7d4f 100644
--- a/android_sdk/build.gradle
+++ b/android_sdk/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         namespace "co.optable"
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
 
         // Here we get version code and version name from latest git release tags:
         versionCode versioning.getVersionCode()
@@ -65,6 +65,9 @@ dependencies {
 
     // Unit tests
     testImplementation("junit:junit:4.13.2")
+    testImplementation("org.mockito:mockito-core:5.12.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
     testImplementation("org.robolectric:robolectric:4.16")
 
     // UI tests
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/Config.kt b/android_sdk/src/main/java/co/optable/android_sdk/Config.kt
deleted file mode 100644
index 07dc1e3..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/Config.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk
-
-import android.util.Base64
-
-class Config(val host: String, val app: String, val insecure: Boolean = false) {
-
-    fun edgeBaseURL(): String {
-        var proto = "https://"
-        if (this.insecure) {
-            proto = "http://"
-        }
-        return proto + this.host + "/"
-    }
-
-    fun passportKey(): String {
-        return key("PASS")
-    }
-
-    fun targetingKey(): String {
-        return key("TGT")
-    }
-
-    private fun key(kind: String): String {
-        val sfx = this.host + "/" + this.app
-        return "OPTABLE_" + kind + "_" + Base64.encodeToString(sfx.toByteArray(), 0)
-    }
-
-}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableConfig.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableConfig.kt
new file mode 100644
index 0000000..e136705
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableConfig.kt
@@ -0,0 +1,42 @@
+package co.optable.android_sdk
+
+import android.content.Context
+
+
+/**
+ * Configuration class for Optable integration.
+ *
+ * @param tenant The tenant name associated with the configuration. E.g. `acmeco.optable.co` => `acmeco`.
+ * @param originSlug The DCN's Source Slug. E.g. `acmeco-sdk`.
+ * @param host The hostname of the Optable endpoint. Default value is "na.edge.optable.co".
+ * @param path The API path to be appended to the host. Default value is "v2".
+ * @param insecure Boolean flag that determines if insecure HTTP should be used instead of HTTPS. Default is false.
+ * @param apiKey An optional API key for authentication. If the API Endpoint is enabled as private, a Service Account API key will be required.
+ * @param customUserAgent An optional custom user agent string for network requests.
+ * @param skipAdvertisingIdDetection Boolean flag to skip the detection of advertising IDs. Default is false.
+ * @param consents Optional `OptableConsents` object for providing custom consent information. If not provided, default values will be used.
+ */
+class OptableConfig @JvmOverloads constructor(
+    providedContext: Context,
+    internal val tenant: String,
+    internal val originSlug: String,
+    internal val host: String = "na.edge.optable.co",
+    internal val path: String = "v2",
+    internal val insecure: Boolean = false,
+    internal val apiKey: String? = null,
+    internal val customUserAgent: String? = null,
+    internal val skipAdvertisingIdDetection: Boolean = false,
+    var consents: OptableConsents = OptableConsents(),
+) {
+
+    internal val context = providedContext.applicationContext
+
+    internal fun getBaseUrl(): String {
+        var proto = "https://"
+        if (insecure) {
+            proto = "http://"
+        }
+        return "$proto$host/$path/"
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableConsents.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableConsents.kt
new file mode 100644
index 0000000..ca18ed8
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableConsents.kt
@@ -0,0 +1,23 @@
+package co.optable.android_sdk
+
+/**
+ * Represents the consent information for GDPR and GPP.
+ *
+ * @param gdprSubject A boolean indicating whether GDPR applies, represented as a integer (0 when it does not apply, 1 when it does). This value should be present when gdpr_consent is supplied.
+ * If not set, SDK will try to fetch data from SharedPreferences (key `IABTCF_gdprApplies`), as stated in
+ * [standard](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/TCFv2/IAB%20Tech%20Lab%20-%20CMP%20API%20v2.md#in-app-details)
+ * @param gdprConsent TCF EU v2 consent string. If not set, SDK will try to fetch data from SharedPreferences (key `IABTCF_TCString`), as stated in
+ * [standard](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/TCFv2/IAB%20Tech%20Lab%20-%20CMP%20API%20v2.md#in-app-details).
+ * @param gpp  GPP privacy string.
+ * If not set, SDK will try to fetch data from SharedPreferences (key `IABGPP_2_TCString`), as stated in
+ * [standard](https://github.com/InteractiveAdvertisingBureau/GDPR-Transparency-and-Consent-Framework/blob/master/TCFv2/IAB%20Tech%20Lab%20-%20CMP%20API%20v2.md#in-app-details)
+ * @param gppSid  A comma-separated list of up to two sections applicable in a given GPP privacy string. This value is required when gpp is present.
+ * @param reg Optable privacy regulation override, which can be one of: `gdpr`, `can`, `us`, or `null` and will override all other privacy regulations when present.
+ */
+data class OptableConsents(
+    val gdprSubject: Boolean? = null,
+    val gdprConsent: String? = null,
+    val gpp: String? = null,
+    val gppSid: String? = null,
+    val reg: String? = null,
+)
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableIdentifiers.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableIdentifiers.kt
new file mode 100644
index 0000000..11e5cfc
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableIdentifiers.kt
@@ -0,0 +1,249 @@
+package co.optable.android_sdk
+
+import co.optable.android_sdk.core.IdentifiersEncoder
+
+/**
+ * Immutable container for a set of user and device identifiers that can be transformed into
+ * Optable Enriched Identifiers (EIDs).
+ *
+ * This type accepts multiple optional identifier values. When EIDs are generated, each supported
+ * identifier is encoded according to its identifier type (for example, some values are normalized,
+ * whitespace-stripped, or encrypted). Additional identifiers may be supplied through the [custom]
+ * map, and pre-encoded values may be provided through [raw].
+ *
+ * EID generation is cached per instance: the first call computes the encoded list and subsequent
+ * calls return the same list for the lifetime of this object.
+ *
+ * @param email Email address. Encoding: normalized (whitespace removed, lowercased) and SHA-256 hashed.
+ * @param phoneNumber Phone number. Encoding: normalized (whitespace removed, lowercased) and SHA-256 hashed.
+ * @param postalCode Postal/ZIP code. Encoding: normalized (whitespace removed, lowercased).
+ * @param ipv4Address IPv4 address. Encoding: whitespace removed.
+ * @param ipv6Address IPv6 address. Encoding: normalized (whitespace removed, lowercased).
+ * @param appleIdfa Apple IDFA (Identifier for Advertisers). Encoding: normalized (whitespace removed, lowercased).
+ * @param googleGaid Google GAID / AAID (Advertising ID). Encoding: normalized (whitespace removed, lowercased).
+ * @param rokuRida Roku RIDA. Encoding: normalized (whitespace removed, lowercased).
+ * @param samsungTifa Samsung TIFA. Encoding: normalized (whitespace removed, lowercased).
+ * @param amazonFireAfai Amazon Fire AFAI. Encoding: normalized (whitespace removed, lowercased).
+ * @param netId NetID identifier. Encoding: whitespace removed.
+ * @param id5 ID5 identifier. Encoding: whitespace removed.
+ * @param utiq Utiq identifier. Encoding: normalized (whitespace removed, lowercased).
+ * @param custom Additional identifier map (type -> value). Encoding: for key "v" whitespace removed; otherwise trimmed.
+ * @param raw Pre-encoded EID strings to include as-is (no encoding applied). Required format: "type:value" (f.e. "c1:value")
+ * @param receiveGaidAutomatically Whether to automatically retrieve GAID (Google Advertising ID). Will be ignored if the `googleGaid` is set.
+ */
+data class OptableIdentifiers @JvmOverloads constructor(
+    val email: String? = null,
+    val phoneNumber: String? = null,
+    val postalCode: String? = null,
+    val ipv4Address: String? = null,
+    val ipv6Address: String? = null,
+    val appleIdfa: String? = null,
+    val googleGaid: String? = null,
+    val rokuRida: String? = null,
+    val samsungTifa: String? = null,
+    val amazonFireAfai: String? = null,
+    val netId: String? = null,
+    val id5: String? = null,
+    val utiq: String? = null,
+    val custom: Map<String, String>? = null,
+    val raw: List<String>? = null,
+    val receiveGaidAutomatically: Boolean = false,
+) {
+
+    private val cachedEnrichedIds: List<String> by lazy { IdentifiersEncoder.encode(this) }
+
+    /**
+     * Generates a list of encoded Enriched Identifiers (EIDs) based on the current contents of the dictionary.
+     */
+    fun generateEnrichedIds(): List<String> {
+        return cachedEnrichedIds
+    }
+
+    class Builder {
+
+        private var email: String? = null
+        private var phoneNumber: String? = null
+        private var postalCode: String? = null
+        private var ipv4Address: String? = null
+        private var ipv6Address: String? = null
+        private var appleIdfa: String? = null
+        private var googleGaid: String? = null
+        private var rokuRida: String? = null
+        private var samsungTifa: String? = null
+        private var amazonFireAfai: String? = null
+        private var netId: String? = null
+        private var id5: String? = null
+        private var utiq: String? = null
+        private var custom: Map<String, String>? = null
+        private var raw: List<String>? = null
+        private var receiveGaidAutomatically: Boolean = false
+
+        /**
+         * Sets the email address.
+         *
+         * @param email Email address. Encoding: normalized (whitespace removed, lowercased) and SHA-256 hashed.
+         */
+        fun email(email: String?) = apply {
+            this.email = email
+        }
+
+        /**
+         * Sets the phone number.
+         *
+         * @param phoneNumber Phone number. Encoding: normalized (whitespace removed, lowercased) and SHA-256 hashed.
+         */
+        fun phoneNumber(phoneNumber: String?) = apply {
+            this.phoneNumber = phoneNumber
+        }
+
+        /**
+         * Sets the postal/ZIP code.
+         *
+         * @param postalCode Postal/ZIP code. Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun postalCode(postalCode: String?) = apply {
+            this.postalCode = postalCode
+        }
+
+        /**
+         * Sets the IPv4 address.
+         *
+         * @param ipv4Address IPv4 address. Encoding: whitespace removed.
+         */
+        fun ipv4Address(ipv4Address: String?) = apply {
+            this.ipv4Address = ipv4Address
+        }
+
+        /**
+         * Sets the IPv6 address.
+         *
+         * @param ipv6Address IPv6 address. Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun ipv6Address(ipv6Address: String?) = apply {
+            this.ipv6Address = ipv6Address
+        }
+
+        /**
+         * Sets the Apple IDFA (Identifier for Advertisers).
+         *
+         * @param appleIdfa Apple IDFA (Identifier for Advertisers). Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun appleIdfa(appleIdfa: String?) = apply {
+            this.appleIdfa = appleIdfa
+        }
+
+        /**
+         * Sets the Google GAID / AAID (Advertising ID).
+         *
+         * @param googleGaid Google GAID / AAID (Advertising ID). Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun googleGaid(googleGaid: String?) = apply {
+            this.googleGaid = googleGaid
+        }
+
+        /**
+         * Sets the Roku RIDA.
+         *
+         * @param rokuRida Roku RIDA. Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun rokuRida(rokuRida: String?) = apply {
+            this.rokuRida = rokuRida
+        }
+
+        /**
+         * Sets the Samsung TIFA.
+         *
+         * @param samsungTifa Samsung TIFA. Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun samsungTifa(samsungTifa: String?) = apply {
+            this.samsungTifa = samsungTifa
+        }
+
+        /**
+         * Sets the Amazon Fire AFAI.
+         *
+         * @param amazonFireAfai Amazon Fire AFAI. Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun amazonFireAfai(amazonFireAfai: String?) = apply {
+            this.amazonFireAfai = amazonFireAfai
+        }
+
+        /**
+         * Sets the NetID identifier.
+         *
+         * @param netId NetID identifier. Encoding: whitespace removed.
+         */
+        fun netId(netId: String?) = apply {
+            this.netId = netId
+        }
+
+        /**
+         * Sets the ID5 identifier.
+         *
+         * @param id5 ID5 identifier. Encoding: whitespace removed.
+         */
+        fun id5(id5: String?) = apply {
+            this.id5 = id5
+        }
+
+        /**
+         * Sets the Utiq identifier.
+         *
+         * @param utiq Utiq identifier. Encoding: normalized (whitespace removed, lowercased).
+         */
+        fun utiq(utiq: String?) = apply {
+            this.utiq = utiq
+        }
+
+        /**
+         * Sets additional identifiers (type -> value).
+         *
+         * @param custom Additional identifier map (type -> value). Encoding: for key "v" whitespace removed; otherwise trimmed.
+         */
+        fun custom(custom: Map<String, String>?) = apply {
+            this.custom = custom
+        }
+
+        /**
+         * Sets pre-encoded EID strings to include as-is.
+         *
+         * @param raw Pre-encoded EID strings to include as-is (no encoding applied).
+         */
+        fun raw(raw: List<String>?) = apply {
+            this.raw = raw
+        }
+
+        /**
+         * Sets whether to automatically retrieve GAID (Google Advertising ID).
+         *
+         * @param receiveGaidAutomatically Whether to automatically retrieve GAID (Google Advertising ID).
+         */
+        fun receiveGaidAutomatically(receiveGaidAutomatically: Boolean) = apply {
+            this.receiveGaidAutomatically = receiveGaidAutomatically
+        }
+
+        /**
+         * Constructs the final immutable OptableIdentifiers object.
+         */
+        fun build(): OptableIdentifiers {
+            return OptableIdentifiers(
+                email = email,
+                phoneNumber = phoneNumber,
+                postalCode = postalCode,
+                ipv4Address = ipv4Address,
+                ipv6Address = ipv6Address,
+                appleIdfa = appleIdfa,
+                googleGaid = googleGaid,
+                rokuRida = rokuRida,
+                samsungTifa = samsungTifa,
+                amazonFireAfai = amazonFireAfai,
+                netId = netId,
+                id5 = id5,
+                utiq = utiq,
+                custom = custom,
+                raw = raw,
+                receiveGaidAutomatically = receiveGaidAutomatically,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableResponse.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableResponse.kt
new file mode 100644
index 0000000..1952fc3
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableResponse.kt
@@ -0,0 +1,34 @@
+package co.optable.android_sdk
+
+/**
+ *  OptableSDK.Response is a generic wrapper for various OptableSDK API result types.
+ *  It also holds the API result status (OptableSDK.Status) to indicate success or error
+ *  resulting from an API call. On success, the response `data` member will hold an instance
+ *  of the API response object. On error, the response `message` string provides a description
+ *  of the error and related debug information.
+ */
+data class OptableResponse<out T>(val status: Status, val data: T?, val message: String?) {
+
+    /**
+     * Represents an error object returned from the Optable SDK API responses.
+     */
+    data class Error(val error: String, val trace: String)
+
+    /**
+     *  OptableSDK.Status lists all of the possible OptableSDK API result statuses.
+     */
+    enum class Status {
+        SUCCESS,
+        ERROR
+    }
+
+    companion object {
+        fun <T> success(data: T?): OptableResponse<T> {
+            return OptableResponse(Status.SUCCESS, data, null)
+        }
+
+        fun <T> error(err: Error): OptableResponse<T> {
+            return OptableResponse(Status.ERROR, null, err.error + " (trace: " + err.trace + ")")
+        }
+    }
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableResult.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableResult.kt
new file mode 100644
index 0000000..b3aff34
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableResult.kt
@@ -0,0 +1,13 @@
+package co.optable.android_sdk
+
+sealed class OptableResult<T> {
+
+    data class Success<T>(
+        val data: T,
+    ) : OptableResult<T>()
+
+    data class Error<T>(
+        val message: String,
+    ) : OptableResult<T>()
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableResultListener.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableResultListener.kt
new file mode 100644
index 0000000..b822de7
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableResultListener.kt
@@ -0,0 +1,7 @@
+package co.optable.android_sdk
+
+fun interface OptableResultListener<T> {
+
+    fun onComplete(response: OptableResult<T>)
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableSDK.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableSDK.kt
index 8250a11..46319e8 100644
--- a/android_sdk/src/main/java/co/optable/android_sdk/OptableSDK.kt
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableSDK.kt
@@ -4,170 +4,88 @@
  */
 package co.optable.android_sdk
 
-import android.content.Context
-import android.net.Uri
-import android.text.TextUtils
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import co.optable.android_sdk.core.Client
-import co.optable.android_sdk.edge.EdgeResponse
+import co.optable.android_sdk.core.*
+import co.optable.android_sdk.core.network.NetworkClient
+import co.optable.android_sdk.core.network.NetworkResponse
+import co.optable.android_sdk.core.network.RequestInterceptor
+import co.optable.android_sdk.core.network.ResponseInterceptor
+import co.optable.android_sdk.core.network.edge.TargetingResponse
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
-import java.security.MessageDigest
-import java.util.Locale.getDefault
 
-/*
- * The following typealiases describe the inputs and successful result types of various
- * OptableSDK APIs:
- */
-
-/**
- * Identify API expects a list of type-prefixed ID string values:
- */
-typealias OptableIdentifyInput = List<String>
-
-/**
- * Profile API expects user traits:
- */
-typealias OptableProfileTraits = HashMap<String,Any>
-
-/**
- * Witness API expects event properties:
- */
-typealias OptableWitnessProperties = HashMap<String,Any>
-
-/**
- * Identify, Profile, and Witness APIs usually just return {}... Void would be better but that
- * results in retrofit2 error when parsing response, even when the API responded successfully,
- * since {} is technically a HashMap:
- */
-typealias OptableIdentifyResponse = HashMap<Any,Any>
-typealias OptableProfileResponse = HashMap<Any,Any>
-typealias OptableWitnessResponse = HashMap<Any,Any>
-
-/**
- * Targeting API responds with a key-values dictionary on success:
- */
-typealias OptableTargetingResponse = HashMap<String, List<String>>
 
 /**
  *  OptableSDK provides an API that is used by an Android app developer integrating with an
  *  Optable Sandbox.
  *
- *  An instance of OptableSDK refers to an Optable Sandbox specified by the caller via `host` and
- *  `app` arguments provided to the constructor. The `context` is required in order for the SDK to
- *  build a WebView() used to read the mobile browser's user-agent string value, which is passed
- *  to the Sandbox.
+ *  An instance of OptableSDK refers to an Optable Sandbox specified by the caller via config provided to the constructor.
+ *  The `context` is required in order for the SDK to build a WebView for receiving the user agent and SharedPreferences.
  *
  *  It is possible to create multiple instances of OptableSDK, should the developer want to
  *  integrate with multiple Sandboxes.
- *
- *  The OptableSDK keeps some state in SharedPreferences
- *  (https://developer.android.com/training/data-storage/shared-preferences), a key/value store
- *  persisted across launches of the app. The state is unique to the app+device, and not globally
- *  unique to the app across devices.
  */
-class OptableSDK @JvmOverloads constructor(context: Context, host: String, app: String, insecure: Boolean = false, useragent: String? = null, skipAdvertisingIdDetection: Boolean = false) {
-    val config = Config(host, app, insecure)
-    val client = Client(config, context, useragent, skipAdvertisingIdDetection)
+class OptableSDK(
+    private val config: OptableConfig,
+) {
 
-    /**
-     *  OptableSDK.Status lists all of the possible OptableSDK API result statuses.
-     */
-    enum class Status {
-        SUCCESS,
-        ERROR
-    }
+    private val storage = LocalStorage(config)
+    private val consentsManager = ConsentsManager(storage)
+    private val adIdManager = GoogleAdIdManager(config)
+    private val networkClient = createNetworkClient()
 
     /**
-     *  OptableSDK.Response is a generic wrapper for various OptableSDK API result types.
-     *  It also holds the API result status (OptableSDK.Status) to indicate success or error
-     *  resulting from an API call. On success, the response `data` member will hold an instance
-     *  of the API response object. On error, the response `message` string provides a description
-     *  of the error and related debug information.
+     * Calls the Optable Sandbox "identify" API, passing it the list of IDs,
+     * a list of type-prefixed identifiers.
      */
-    data class Response<out T>(val status: Status, val data: T?, val message: String?) {
-        data class Error(val error: String, val trace: String) {}
-
-        companion object {
-            fun <T> success(data: T?): Response<T> {
-                return Response(Status.SUCCESS, data, null)
-            }
-            fun <T> error(err: Error): Response<T> {
-                return Response(Status.ERROR, null,
-                    err.error + " (trace: " + err.trace + ")")
-            }
-        }
-    }
+    fun identify(ids: OptableIdentifiers, listener: OptableResultListener<Unit>) {
+        GlobalScope.launch {
+            val response = networkClient.identify(ids)
 
-    /**
-     *  identify(idList) calls the Optable Sandbox "identify" API, passing it the list of IDs
-     *  in idList, a list of type-prefixed identifiers.
-     *
-     *  It is asynchronous, so the caller may call observe() on the returned LiveData and expect
-     *  an instance of Response<OptableIdentifyResponse> in the result. Success can be checked by
-     *  comparing result.status to OptableSDK.Status.SUCCESS. Note that result.data!! will point
-     *  to an empty HashMap on success, and can therefore be ignored.
-     */
-    fun identify(idList: OptableIdentifyInput): LiveData<Response<OptableIdentifyResponse>> {
-        val liveData = MutableLiveData<Response<OptableIdentifyResponse>>()
-        val client = this.client
+            MainScope().launch {
+                val optableResult = when (response) {
+                    is NetworkResponse.Success -> {
+                        OptableResult.Success(Unit)
+                    }
 
-        GlobalScope.launch {
-            val response = client.Identify(idList)
-            when (response) {
-                is EdgeResponse.Success -> {
-                    liveData.postValue(Response.success(response.body))
-                }
-                is EdgeResponse.ApiError -> {
-                    liveData.postValue(Response.error(response.body))
-                }
-                is EdgeResponse.NetworkError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("NetworkError", "None")))
-                }
-                is EdgeResponse.UnknownError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("UnknownError", "None")))
+                    is NetworkResponse.Error -> {
+                        OptableResult.Error(response.message)
+                    }
                 }
+                listener.onComplete(optableResult)
             }
         }
-
-        return liveData
     }
 
+
     /**
-     *  identify(email, gaid?, ppid?) calls the Optable Sandbox "identify" API, passing it the
-     *  SHA-256 of the caller-provided 'email' and, when specified via the 'gaid' Boolean, the
-     *  Google Advertising ID of the device. If the 'ppid' String is specified, it will also be
-     *  sent for identity resolution.
+     *  Calls the Optable Sandbox "identify" API, passing only email, GAID and PPID.
      *
-     *  The function is async, so the caller may call observe() on the returned LiveData and expect
-     *  an instance of Response<OptableIdentifyResponse> in the result. Success can be checked by
-     *  comparing result.status to OptableSDK.Status.SUCCESS. Note that result.data!! will point
-     *  to an empty HashMap on success, and can therefore be ignored.
+     *  @param email email address to identify (encrypted with SHA256)
+     *  @param gaid Should receive Google Advertising ID of the device
+     *  @param ppid Should receive PPID of the device
      */
     @JvmOverloads
-    fun identify(email: String, gaid: Boolean? = false, ppid: String? = null):
-            LiveData<Response<OptableIdentifyResponse>>
-    {
-        var idList: OptableIdentifyInput = listOf()
-
-        if (!TextUtils.isEmpty(email) &&
-            android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches())
-        {
-            idList += Companion.eid(email)
-        }
-
-        if (gaid!! && this.client.hasGAID()) {
-            idList += Companion.gaid(this.client.GAID()!!)
-        }
-
-        if ((ppid != null) && (ppid.length > 0)) {
-            idList += Companion.cid(ppid)
-        }
-
-        return this.identify(idList)
+    fun identify(email: String, gaid: Boolean = false, ppid: String? = null, listener: OptableResultListener<Unit>) {
+        val emailValue = if (email.isNotBlank() && android.util.Patterns.EMAIL_ADDRESS.matcher(email).matches()) {
+            email
+        } else null
+
+        val gaid = if (gaid) {
+            adIdManager.getId()
+        } else null
+
+        val ppid = if (ppid != null) {
+            listOf("c:$ppid")
+        } else null
+
+        val ids = OptableIdentifiers(
+            email = emailValue,
+            googleGaid = gaid,
+            raw = ppid
+        )
+
+        return identify(ids, listener)
     }
 
     /**
@@ -179,181 +97,144 @@ class OptableSDK @JvmOverloads constructor(context: Context, host: String, app:
      * contain an "oeid" value with the SHA256(downcase(email)) of an incoming user, such
      * as encoded links in newsletter Emails sent by the application developer.
      */
-    fun tryIdentifyFromURI(uri: Uri) {
-        val oeid = Companion.eidFromURI(uri)
+    fun tryIdentifyFromUrl(url: String, listener: OptableResultListener<Unit>) {
+        val id = IdentifiersEncoder.eidFromUrl(url)
 
-        if (oeid.length > 0) {
-            this.identify(listOf(oeid))
+        if (id == null) {
+            listener.onComplete(OptableResult.Error("Can't find `oeid` in url: $url"))
+            return
         }
+
+        val ids = OptableIdentifiers.Builder().raw(listOf(id)).build()
+        this.identify(ids, listener)
     }
 
     /**
-     *  profile(traits) calls the Optable Sandbox "profile" API in order to associate the
-     *  specified keyvalue OptableProfileTraits 'traits', which can be subsequently used for
-     *  audience assembly.
-     *
-     *  It is asynchronous, so the caller may call observe() on the returned LiveData and expect
-     *  an instance of Response<OptableProfileResponse> in the result. Success can be checked by
-     *  comparing result.status to OptableSDK.Status.SUCCESS. Note that result.data!! will point
-     *  to an empty HashMap on success, and can therefore be ignored.
+     * Calls the Optable Sandbox "profile" API to associate the
+     * specified key-value traits, which can be subsequently used for
+     * audience assembly.
      */
-    fun profile(traits: OptableProfileTraits):
-            LiveData<Response<OptableProfileResponse>> {
-        val liveData = MutableLiveData<Response<OptableProfileResponse>>()
-        val client = this.client
-
+    fun profile(traits: HashMap<String, Any>, listener: OptableResultListener<Unit>) {
         GlobalScope.launch {
-            val response = client.Profile(traits)
-            when (response) {
-                is EdgeResponse.Success -> {
-                    liveData.postValue(Response.success(response.body))
-                }
-                is EdgeResponse.ApiError -> {
-                    liveData.postValue(Response.error(response.body))
-                }
-                is EdgeResponse.NetworkError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("NetworkError", "None")))
-                }
-                is EdgeResponse.UnknownError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("UnknownError", "None")))
+            val response = networkClient.profile(traits)
+
+            MainScope().launch {
+                val optableResult = when (response) {
+                    is NetworkResponse.Success -> {
+                        OptableResult.Success(Unit)
+                    }
+
+                    is NetworkResponse.Error -> {
+                        OptableResult.Error(response.message)
+                    }
                 }
+                listener.onComplete(optableResult)
             }
         }
-
-        return liveData
     }
 
     /**
-     *  targeting() calls the Optable Sandbox "targeting" API, which returns the key-value targeting
-     *  data matching the user/device/app.
-     *
-     *  It is asynchronous, so the caller should call observe() on the returned LiveData and expect
-     *  an instance of Response<OptableTargetingResponse> in the result. Success can be checked by
-     *  comparing result.status to OptableSDK.Status.SUCCESS, and when successful, result.data!! is
-     *  of type OptableTargetingResponse.
+     * Calls the Optable Sandbox "targeting" API, which returns the key-value targeting
+     * data matching the user/device/app and part of the OpenRTB code snippet.
+     * @see OptableTargeting
      */
-    fun targeting(): LiveData<Response<OptableTargetingResponse>> {
-        val liveData = MutableLiveData<Response<OptableTargetingResponse>>()
-        val client = this.client
-
+    fun targeting(ids: OptableIdentifiers, listener: OptableResultListener<OptableTargeting>) {
         GlobalScope.launch {
-            val response = client.Targeting()
-            when (response) {
-                is EdgeResponse.Success -> {
-                    client.TargetingSetCache(response.body)
-                    liveData.postValue(Response.success(response.body))
-                }
-                is EdgeResponse.ApiError -> {
-                    liveData.postValue(Response.error(response.body))
-                }
-                is EdgeResponse.NetworkError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("NetworkError", "None")))
-                }
-                is EdgeResponse.UnknownError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("UnknownError", "None")))
-                }
+            val response = networkClient.targeting(ids)
+
+            MainScope().launch {
+                val optableResult = when (response) {
+                    is NetworkResponse.Success -> {
+                        val targeting = OptableTargeting(
+                            parseAudiences(response),
+                            response.result.ortb2.toString()
+                        )
+                        storage.setTargeting(targeting)
+                        OptableResult.Success(targeting)
+                    }
+
+                    is NetworkResponse.Error -> {
+                        OptableResult.Error(response.message)
+                    }
+                }
+                listener.onComplete(optableResult)
             }
         }
-
-        return liveData
     }
 
-    fun targetingFromCache(): OptableTargetingResponse? {
-        return this.client.TargetingFromCache()
+    /**
+     * Returns the targeting data from the cache, if available.
+     */
+    fun targetingFromCache(): OptableTargeting? {
+        return storage.getTargeting()
     }
 
+    /**
+     * Clears the targeting data from the cache.
+     */
     fun targetingClearCache() {
-        this.client.TargetingClearCache()
+        storage.clearTargeting()
     }
 
     /**
-     *  witness(event, properties) calls the Optable Sandbox "witness" API in order to log a
-     *  specified 'event' (e.g., "app.screenView", "ui.buttonPressed"), with the specified keyvalue
-     *  OptableWitnessProperties 'properties', which can be subsequently used for audience assembly.
-     *
-     *  It is asynchronous, so the caller may call observe() on the returned LiveData and expect
-     *  an instance of Response<OptableWitnessResponse> in the result. Success can be checked by
-     *  comparing result.status to OptableSDK.Status.SUCCESS. Note that result.data!! will point
-     *  to an empty HashMap on success, and can therefore be ignored.
+     * Calls the Optable Sandbox "witness" API to log a
+     * specified 'event' (e.g., "app.screenView", "ui.buttonPressed"), with the specified key-value
+     * 'properties', which can be subsequently used for audience assembly.
      */
-    fun witness(event: String, properties: OptableWitnessProperties):
-            LiveData<Response<OptableWitnessResponse>> {
-        val liveData = MutableLiveData<Response<OptableWitnessResponse>>()
-        val client = this.client
-
+    fun witness(
+        event: String,
+        properties: HashMap<String, Any>,
+        listener: OptableResultListener<Unit>,
+    ) {
         GlobalScope.launch {
-            val response = client.Witness(event, properties)
-            when (response) {
-                is EdgeResponse.Success -> {
-                    liveData.postValue(Response.success(response.body))
-                }
-                is EdgeResponse.ApiError -> {
-                    liveData.postValue(Response.error(response.body))
-                }
-                is EdgeResponse.NetworkError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("NetworkError", "None")))
-                }
-                is EdgeResponse.UnknownError -> {
-                    liveData.postValue(Response.error(
-                        Response.Error("UnknownError", "None")))
-                }
+            val response = networkClient.witness(event, properties)
+            MainScope().launch {
+                val optableResult = when (response) {
+                    is NetworkResponse.Success -> {
+                        OptableResult.Success(Unit)
+                    }
+
+                    is NetworkResponse.Error -> {
+                        OptableResult.Error(response.message)
+                    }
+                }
+                listener.onComplete(optableResult)
             }
         }
+    }
+
+    /**
+     * Sets custom consents for the Optable SDK.
+     * @see OptableConsents
+     */
+    fun setConsents(consents: OptableConsents) {
+        consentsManager.customConsents = consents
+    }
 
-        return liveData
+    private fun createNetworkClient(): NetworkClient {
+        val userAgentHolder = UserAgentHolder(config)
+        val consentsManager = ConsentsManager(storage)
+        val requestInterceptor = RequestInterceptor(config, storage, userAgentHolder, consentsManager)
+        val responseInterceptor = ResponseInterceptor(storage)
+        return NetworkClient(config, requestInterceptor, responseInterceptor)
     }
 
-    companion object {
-        /**
-         * eid(email) is a helper that returns type-prefixed SHA256(downcase(email))
-         */
-        fun eid(email: String): String {
-            return "e:" + MessageDigest.getInstance("SHA-256")
-                .digest(email.lowercase(getDefault()).trim().toByteArray())
-                .fold("", { str, it -> str + "%02x".format(it) })
-        }
 
-        /**
-         * gaid(gaid) is a helper that returns the type-prefixed Google Advertising ID
-         */
-        fun gaid(gaid: String): String {
-            return "g:" + gaid.lowercase(getDefault()).trim()
-        }
+    private fun parseAudiences(response: NetworkResponse.Success<TargetingResponse>): Map<String, List<String>>? {
+        val audiences = response.result.audience
 
-        /**
-         * cid(ppid) is a helper that returns custom type-prefixed origin-provided PPID
-         */
-        fun cid(ppid: String): String {
-            return "c:" + ppid.trim()
-        }
+        if (audiences.isNullOrEmpty()) return null
 
-        /**
-         * eidFromURI(uri) is a helper that returns a type-prefixed ID based on the query string
-         * oeid=sha256value parameters in the specified uri, if one is found. Otherwise, it returns
-         * an empty string.
-         *
-         * The use for this is when handling incoming deep links which might contain an "oeid" value
-         * with the SHA256(downcase(email)) of a user, such as encoded links in newsletter Emails
-         * sent by the application developer. Such hashed Email values can be used in calls to
-         * identify()
-         */
-        fun eidFromURI(uri: Uri): String {
-            // We first convert the Uri to a lowercase string then re-parse it so that we are
-            // not dependent on case-sensitivity of the "oeid" query parameter:
-            var oeid = Uri.parse(uri.toString().lowercase(getDefault())).getQueryParameter("oeid")
-
-            if ((oeid == null) || (oeid.length != 64) ||
-                (oeid.matches("^[a-f0-9]$".toRegex(RegexOption.IGNORE_CASE))))
-            {
-                return ""
-            }
+        val result = mutableMapOf<String, List<String>>()
+        for (audience in audiences) {
+            if (audience.provider.isNullOrBlank()) continue
+
+            if (audience.ids.isNullOrEmpty()) continue
 
-            return "e:" + oeid.lowercase(getDefault())
+            result[audience.provider] = audience.ids.mapNotNull { it.id }
         }
+        return result
     }
-}
\ No newline at end of file
+
+}
+
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/OptableTargeting.kt b/android_sdk/src/main/java/co/optable/android_sdk/OptableTargeting.kt
new file mode 100644
index 0000000..ebc535c
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/OptableTargeting.kt
@@ -0,0 +1,6 @@
+package co.optable.android_sdk
+
+data class OptableTargeting(
+    val audiences: Map<String, List<String>>?,
+    val openRtbJson: String?,
+)
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/Client.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/Client.kt
deleted file mode 100644
index cef08e7..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/core/Client.kt
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk.core
-
-import android.content.Context
-import android.text.TextUtils
-import android.webkit.WebView
-import co.optable.BuildConfig
-import co.optable.android_sdk.*
-import co.optable.android_sdk.edge.EdgeResponse
-import co.optable.android_sdk.edge.EdgeResponseAdapterFactory
-import co.optable.android_sdk.edge.EdgeService
-import com.google.android.gms.ads.identifier.AdvertisingIdClient
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import okhttp3.Interceptor
-import okhttp3.OkHttpClient
-import okhttp3.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class Client(private val config: Config, private val context: Context, private val useragent: String?, private val skipAdvertisingIdDetection: Boolean) {
-    var gaid: String? = null
-    var gaidLAT: Boolean? = true
-
-    private val edgeService: EdgeService?
-    private val storage = LocalStorage(this.config, this.context)
-    private var userAgent: String? = this.useragent
-
-    private class RequestInterceptor(private val userAgent: String, private val storage: LocalStorage): Interceptor {
-        override fun intercept(chain: Interceptor.Chain): Response {
-            var oldRequest = chain.request()
-
-            var newURL = oldRequest.url.newBuilder()
-                .addQueryParameter(
-                    "osdk", "android-${BuildConfig.VERSION_NAME}-${BuildConfig.VERSION_CODE}"
-                ).build()
-            var newRequest = oldRequest.newBuilder()
-                .url(newURL)
-                .addHeader("User-Agent", userAgent)
-
-            val pass = storage.getPassport()
-            if (pass != null) {
-                newRequest = newRequest.addHeader("X-Optable-Visitor", pass)
-            }
-            return chain.proceed(newRequest.build())
-        }
-    }
-
-    private class ResponseInterceptor(private val storage: LocalStorage): Interceptor {
-        override fun intercept(chain: Interceptor.Chain): Response {
-            val originalResponse = chain.proceed(chain.request())
-            val pass = originalResponse.header("X-Optable-Visitor")
-            if (pass != null) {
-                storage.setPassport(pass)
-            }
-            return originalResponse.newBuilder().build()
-        }
-    }
-
-    init {
-        if (!this.skipAdvertisingIdDetection) {
-            this.determineAdvertisingInfo()
-        }
-
-        if (this.userAgent == null) {
-            this.userAgent = this.userAgent()
-        }
-
-        val client = OkHttpClient.Builder()
-            .addInterceptor(RequestInterceptor(this.userAgent!!, storage))
-            .addInterceptor(ResponseInterceptor(storage))
-            .build()
-
-        val retrofit = Retrofit.Builder()
-            .baseUrl(config.edgeBaseURL())
-            .addCallAdapterFactory(EdgeResponseAdapterFactory())
-            .addConverterFactory(GsonConverterFactory.create())
-            .client(client)
-            .build()
-
-        edgeService = retrofit.create(EdgeService::class.java)
-    }
-
-    suspend fun Identify(idList: OptableIdentifyInput):
-            EdgeResponse<OptableIdentifyResponse, OptableSDK.Response.Error>
-    {
-        return edgeService!!.Identify(this.config.app, idList)
-    }
-
-    suspend fun Profile(traits: OptableProfileTraits):
-            EdgeResponse<OptableProfileResponse, OptableSDK.Response.Error>
-    {
-        val profileBody = HashMap<String,Any>()
-        profileBody.put("traits", traits)
-        return edgeService!!.Profile(this.config.app, profileBody)
-    }
-
-    suspend fun Targeting():
-            EdgeResponse<OptableTargetingResponse, OptableSDK.Response.Error>
-    {
-        return edgeService!!.Targeting(this.config.app)
-    }
-
-    suspend fun Witness(event: String, properties: OptableWitnessProperties):
-            EdgeResponse<OptableWitnessResponse, OptableSDK.Response.Error>
-    {
-        val evtBody = HashMap<String,Any>()
-        evtBody.put("event", event)
-        evtBody.put("properties", properties)
-        return edgeService!!.Witness(this.config.app, evtBody)
-    }
-
-    fun TargetingSetCache(keyvalues: OptableTargetingResponse) {
-        storage.setTargeting(keyvalues)
-    }
-
-    fun TargetingFromCache(): OptableTargetingResponse? {
-        return storage.getTargeting()
-    }
-
-    fun TargetingClearCache() {
-        storage.clearTargeting()
-    }
-
-    fun hasGAID(): Boolean {
-        return ((gaid != null) && (gaidLAT == false) && !TextUtils.isEmpty(gaid!!))
-    }
-
-    fun GAID(): String? {
-        return gaid
-    }
-
-    private fun userAgent(): String {
-        return WebView(this.context).settings.userAgentString
-    }
-
-    private fun determineAdvertisingInfo() {
-        val context = this.context
-        GlobalScope.launch {
-            var adInfo: AdvertisingIdClient.Info? = null
-            try {
-                adInfo = AdvertisingIdClient.getAdvertisingIdInfo(context)
-            } catch(e: Exception) {}
-
-            gaid = adInfo?.id
-            gaidLAT = adInfo?.isLimitAdTrackingEnabled
-        }
-    }
-}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/ConsentsManager.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/ConsentsManager.kt
new file mode 100644
index 0000000..bf7dfa4
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/ConsentsManager.kt
@@ -0,0 +1,48 @@
+package co.optable.android_sdk.core
+
+import co.optable.android_sdk.OptableConsents
+
+internal class ConsentsManager(
+    private val localStorage: LocalStorage,
+    var customConsents: OptableConsents = OptableConsents()
+) {
+
+    fun subjectToGdpr(): Boolean? {
+        if (customConsents.gdprSubject != null) {
+            return customConsents.gdprSubject
+        }
+        if (localStorage.getSubjectToGdpr() != null) {
+            return localStorage.getSubjectToGdpr() == 1
+        }
+        return null
+    }
+
+    fun gdprConsent(): String? {
+        if (customConsents.gdprConsent != null) {
+            return customConsents.gdprConsent
+        }
+        if (localStorage.getGdprConsent() != null) {
+            return localStorage.getGdprConsent()
+        }
+        return null
+    }
+
+    fun gppConsent(): String? {
+        if (customConsents.gpp != null) {
+            return customConsents.gpp
+        }
+        if (localStorage.getGppConsent() != null) {
+            return localStorage.getGppConsent()
+        }
+        return null
+    }
+
+    fun gppSid(): String? {
+        return customConsents.gppSid
+    }
+
+    fun customRegulation(): String? {
+        return customConsents.reg
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/GoogleAdIdManager.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/GoogleAdIdManager.kt
new file mode 100644
index 0000000..530544a
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/GoogleAdIdManager.kt
@@ -0,0 +1,48 @@
+package co.optable.android_sdk.core
+
+import android.text.TextUtils
+import co.optable.android_sdk.OptableConfig
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+
+internal class GoogleAdIdManager(
+    val config: OptableConfig,
+) {
+
+    companion object {
+        internal var adId: String? = null
+        internal var limitAdTracking: Boolean? = true
+    }
+
+    init {
+        if (!config.skipAdvertisingIdDetection) {
+            updateAdvertisingId()
+        }
+    }
+
+    fun updateAdvertisingId() {
+        GlobalScope.launch {
+            var adInfo: AdvertisingIdClient.Info? = null
+            try {
+                adInfo = AdvertisingIdClient.getAdvertisingIdInfo(config.context)
+            } catch (_: Exception) {
+            }
+
+            MainScope().launch {
+                adId = adInfo?.id
+                limitAdTracking = adInfo?.isLimitAdTrackingEnabled
+            }
+        }
+    }
+
+    fun hasId(): Boolean {
+        return ((adId != null) && (limitAdTracking == false) && !TextUtils.isEmpty(adId!!))
+    }
+
+    fun getId(): String? {
+        return adId
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/IdentifiersEncoder.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/IdentifiersEncoder.kt
new file mode 100644
index 0000000..401452a
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/IdentifiersEncoder.kt
@@ -0,0 +1,141 @@
+package co.optable.android_sdk.core
+
+import android.util.Log
+import androidx.core.net.toUri
+import co.optable.android_sdk.OptableIdentifiers
+import java.security.MessageDigest
+import java.util.*
+
+/**
+ * Utility object responsible for encoding raw identifiers into Optable Enriched Identifiers (EIDs).
+ */
+object IdentifiersEncoder {
+
+    private const val EMAIL = "e"
+    private const val PHONE = "p"
+    private const val POSTAL = "z"
+    private const val IPV4 = "i4"
+    private const val IPV6 = "i6"
+    private const val IDFA = "a"
+    private const val GAID = "g"
+    private const val RIDA = "r"
+    private const val TIFA = "s"
+    private const val AFAI = "f"
+    private const val NETID = "n"
+    private const val ID5 = "id5"
+    private const val UTIQ = "utiq"
+    private const val VID = "v"
+
+    fun encode(ids: OptableIdentifiers): List<String> {
+        val result = mutableListOf<String>()
+
+        result.addIfNotNull(EMAIL, ids.email, ::encrypt)
+        result.addIfNotNull(PHONE, ids.phoneNumber, ::encrypt)
+        result.addIfNotNull(POSTAL, ids.postalCode, ::normalize)
+        result.addIfNotNull(IPV4, ids.ipv4Address, ::removeWhitespaces)
+        result.addIfNotNull(IPV6, ids.ipv6Address, ::normalize)
+        result.addIfNotNull(IDFA, ids.appleIdfa, ::normalize)
+        result.addIfNotNull(GAID, ids.googleGaid, ::normalize)
+        result.addIfNotNull(RIDA, ids.rokuRida, ::normalize)
+        result.addIfNotNull(TIFA, ids.samsungTifa, ::normalize)
+        result.addIfNotNull(AFAI, ids.amazonFireAfai, ::normalize)
+        result.addIfNotNull(NETID, ids.netId, ::removeWhitespaces)
+        result.addIfNotNull(ID5, ids.id5, ::removeWhitespaces)
+        result.addIfNotNull(UTIQ, ids.utiq, ::normalize)
+
+        if (ids.googleGaid == null && ids.receiveGaidAutomatically) {
+            GoogleAdIdManager.adId?.let { adId ->
+                result.addIfNotNull(GAID, adId, ::normalize)
+            }
+        }
+
+        for ((key, value) in ids.custom ?: emptyMap()) {
+            when {
+                key == VID -> {
+                    result.addIfNotNull(key, value, ::removeWhitespaces)
+                }
+
+                else -> {
+                    result.addIfNotNull(key, value, ::trim)
+                }
+            }
+        }
+
+        for (rawValue in ids.raw ?: emptyList()) {
+            result.add(rawValue)
+        }
+
+        return result
+    }
+
+    private fun MutableList<String>.addIfNotNull(key: String, value: String?, encoder: (String) -> String) {
+        if (value == null) return
+
+        val encodedValue = encoder(value)
+        val result = "$key:$encodedValue"
+        this.add(result)
+    }
+
+    /**
+     * eidFromURI(uri) is a helper that returns a type-prefixed ID based on the query string
+     * oeid=sha256value parameters in the specified uri, if one is found. Otherwise, it returns
+     * an empty string.
+     *
+     * The use for this is when handling incoming deep links which might contain an "oeid" value
+     * with the SHA256(downcase(email)) of a user, such as encoded links in newsletter Emails
+     * sent by the application developer. Such hashed Email values can be used in calls to
+     * identify()
+     *
+     * Algorithm.
+     * We first convert the Uri to a lowercase string then re-parse it so that we are
+     * not dependent on case-sensitivity of the "oeid" query parameter
+     */
+    fun eidFromUrl(urlString: String): String? {
+        try {
+            val uri = urlString.lowercase(Locale.ROOT).toUri()
+            val id = uri.getQueryParameter("oeid")
+
+            val wrongId = (id == null) || (id.length != 64) || (id.matches("^[a-f0-9]$".toRegex()))
+            if (!wrongId) {
+                return "e:$id"
+            }
+        } catch (e: Exception) {
+            Log.e("OptableSDK", "Can't get eid from $urlString", e)
+        }
+        return null
+    }
+
+
+    /**
+     * Computes SHA-256 hash of the input string.
+     */
+    private fun encrypt(value: String): String {
+        val normalizedBytes = normalize(value).toByteArray(Charsets.UTF_8)
+        val encryptedBytes = MessageDigest.getInstance("SHA-256").digest(normalizedBytes)
+        val encryptedValue = encryptedBytes.joinToString("") { "%02x".format(it) }
+        return encryptedValue
+    }
+
+    /**
+     * Normalizes an identifier string by removing all whitespace and lowercasing the result.
+     * This is used for hash-based EIDs (email, phone).
+     */
+    private fun normalize(value: String): String {
+        return value.replace("\\s+".toRegex(), "").lowercase(Locale.ROOT)
+    }
+
+    /**
+     * Normalizes an identifier string by removing all whitespace.
+     * This is used for raw EIDs (like IP addresses).
+     */
+    private fun removeWhitespaces(value: String): String {
+        return value.replace("\\s+".toRegex(), "")
+    }
+
+    /**
+     * Simple trim.
+     */
+    private fun trim(value: String): String {
+        return value.trim()
+    }
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/LocalStorage.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/LocalStorage.kt
index 9f5c1f9..76d5ee1 100644
--- a/android_sdk/src/main/java/co/optable/android_sdk/core/LocalStorage.kt
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/LocalStorage.kt
@@ -4,47 +4,102 @@
  */
 package co.optable.android_sdk.core
 
-import android.content.Context
+import android.util.Base64
+import android.util.Log
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
-import co.optable.android_sdk.Config
-import co.optable.android_sdk.OptableTargetingResponse
+import co.optable.android_sdk.OptableConfig
+import co.optable.android_sdk.OptableTargeting
 import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
 
-internal class LocalStorage(private val config: Config, private val context: Context) {
-    private val prefs = PreferenceManager.getDefaultSharedPreferences(this.context)
-    private val passportKey = this.config.passportKey()
-    private val targetingKey = this.config.targetingKey()
+/**
+ * Manages SharedPreferences for Optable SDK.
+ */
+internal class LocalStorage(
+    config: OptableConfig,
+) {
+
+    companion object {
+        private const val KEY_SUBJECT_TO_GDPR = "IABTCF_gdprApplies"
+        private const val KEY_GDPR_CONSENT = "IABTCF_TCString"
+        private const val KEY_GPP_CONSENT = "IABGPP_2_TCString"
+    }
+
+    private val prefs = PreferenceManager.getDefaultSharedPreferences(config.context)
+    private val passportKey = generateUniqueKey("PASS", config)
+    private val targetingKey = generateUniqueKey("TGT", config)
 
     fun getPassport(): String? {
         return prefs.getString(passportKey, null)
     }
 
     fun setPassport(passport: String) {
-        val editor = prefs.edit()
-        editor.putString(passportKey, passport)
-        editor.apply()
+        prefs.edit(commit = true) {
+            putString(passportKey, passport)
+        }
     }
 
-    fun getTargeting(): OptableTargetingResponse? {
-        val response = prefs.getString(targetingKey, null)
-        if (response == null) {
-            return null
+    fun getTargeting(): OptableTargeting? {
+        try {
+            val targeting = prefs.getString(targetingKey, null) ?: return null
+            return Gson().fromJson(targeting, OptableTargeting::class.java)
+        } catch (e: Exception) {
+            Log.e("OptableSDK", "Can't parse cached targeting: ${e.message}. Clearing...")
+            prefs.edit(commit = true) { remove(targetingKey) }
         }
-
-        val ttype = object : TypeToken<OptableTargetingResponse>() {}.type
-        return Gson().fromJson(response, ttype)
+        return null
     }
 
-    fun setTargeting(keyvalues: OptableTargetingResponse) {
-        val editor = prefs.edit()
-        editor.putString(targetingKey, Gson().toJson(keyvalues))
-        editor.apply()
+    fun setTargeting(targeting: OptableTargeting) {
+        try {
+            prefs.edit(commit = true) {
+                putString(targetingKey, Gson().toJson(targeting))
+            }
+        } catch (e: Exception) {
+            Log.e("OptableSDK", "Can't set targeting: ${e.message}")
+        }
     }
 
     fun clearTargeting() {
-        val editor = prefs.edit()
-        editor.remove(targetingKey)
-        editor.apply()
+        prefs.edit(commit = true) {
+            remove(targetingKey)
+        }
+    }
+
+    fun getSubjectToGdpr(): Int? {
+        try {
+            val result = prefs.getInt(KEY_SUBJECT_TO_GDPR, -1)
+            if (result == -1) {
+                return null
+            }
+            return result
+        } catch (e: Exception) {
+            Log.e("OptableSDK", "Can't get subject to GDPR: ${e.message}")
+        }
+        return null
+    }
+
+    fun getGdprConsent(): String? {
+        try {
+            return prefs.getString(KEY_GDPR_CONSENT, null)
+        } catch (e: Exception) {
+            Log.e("OptableSDK", "Can't get GDPR consent: ${e.message}")
+        }
+        return null
+    }
+
+    fun getGppConsent(): String? {
+        try {
+            return prefs.getString(KEY_GPP_CONSENT, null)
+        } catch (e: Exception) {
+            Log.e("OptableSDK", "Can't get GPP consent: ${e.message}")
+        }
+        return null
     }
+
+    private fun generateUniqueKey(kind: String, config: OptableConfig): String {
+        val sfx = "${config.host}/${config.tenant}/${config.originSlug}"
+        return "OPTABLE_" + kind + "_" + Base64.encodeToString(sfx.toByteArray(), 0)
+    }
+
 }
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/UserAgentHolder.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/UserAgentHolder.kt
new file mode 100644
index 0000000..07c3831
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/UserAgentHolder.kt
@@ -0,0 +1,24 @@
+package co.optable.android_sdk.core
+
+import android.content.Context
+import android.webkit.WebView
+import co.optable.android_sdk.OptableConfig
+
+internal class UserAgentHolder(
+    config: OptableConfig,
+) {
+
+    private val cachedUserAgent: String? = config.customUserAgent ?: userAgentFromWebView(config.context)
+
+    fun getUserAgent() = cachedUserAgent
+
+
+    private fun userAgentFromWebView(context: Context): String? {
+        return try {
+            WebView(context).settings.userAgentString
+        } catch (_: Exception) {
+            null
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkClient.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkClient.kt
new file mode 100644
index 0000000..9fbb50a
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkClient.kt
@@ -0,0 +1,87 @@
+package co.optable.android_sdk.core.network
+
+import co.optable.android_sdk.OptableConfig
+import co.optable.android_sdk.OptableIdentifiers
+import co.optable.android_sdk.core.network.edge.EdgeService
+import co.optable.android_sdk.core.network.edge.TargetingResponse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import retrofit2.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+internal class NetworkClient(
+    config: OptableConfig,
+    requestInterceptor: RequestInterceptor,
+    responseInterceptor: ResponseInterceptor,
+) {
+
+    private val edgeService: EdgeService
+
+    init {
+        val client = OkHttpClient.Builder()
+            .addInterceptor(requestInterceptor)
+            .addInterceptor(responseInterceptor)
+            .build()
+
+        val gsonFactory = GsonConverterFactory.create()
+
+        val retrofit = Retrofit.Builder()
+            .baseUrl(config.getBaseUrl())
+            .addConverterFactory(gsonFactory)
+            .client(client)
+            .build()
+
+        edgeService = retrofit.create(EdgeService::class.java)
+    }
+
+    suspend fun identify(idList: OptableIdentifiers): NetworkResponse<Unit> {
+        return runSafe {
+            val ids = idList.generateEnrichedIds()
+            edgeService.identify(ids)
+        }
+    }
+
+    suspend fun profile(traits: HashMap<String, Any>): NetworkResponse<Unit> {
+        return runSafe {
+            val profileBody = HashMap<String, Any>()
+            profileBody["traits"] = traits
+            edgeService.profile(traits)
+        }
+    }
+
+    suspend fun targeting(idList: OptableIdentifiers): NetworkResponse<TargetingResponse> {
+        return runSafe {
+            val ids = idList.generateEnrichedIds()
+            edgeService.targeting(ids)
+        }
+    }
+
+    suspend fun witness(
+        event: String,
+        properties: HashMap<String, Any>,
+    ): NetworkResponse<Unit> {
+        return runSafe {
+            val evtBody = HashMap<String, Any>()
+            evtBody["event"] = event
+            evtBody["properties"] = properties
+            edgeService.witness(evtBody)
+        }
+    }
+
+    private suspend fun <T> runSafe(responseBuilder: suspend () -> Response<T>): NetworkResponse<T> {
+        val result = runCatching {
+            return withContext(Dispatchers.IO) {
+                val response = responseBuilder()
+                if (response.isSuccessful) {
+                    return@withContext NetworkResponse.Success(response.body()!!)
+                } else {
+                    return@withContext NetworkResponse.Error("Request failed with status code $response: ${response.errorBody()}")
+                }
+            }
+        }
+        return result.getOrNull() ?: NetworkResponse.Error(result.exceptionOrNull()?.message ?: "Unknown error")
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkResponse.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkResponse.kt
new file mode 100644
index 0000000..741ae5c
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkResponse.kt
@@ -0,0 +1,13 @@
+package co.optable.android_sdk.core.network
+
+sealed class NetworkResponse<T> {
+
+    data class Success<T>(
+        val result: T,
+    ) : NetworkResponse<T>()
+
+    data class Error<T>(
+        val message: String,
+    ) : NetworkResponse<T>()
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/network/RequestInterceptor.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/network/RequestInterceptor.kt
new file mode 100644
index 0000000..a5dfd11
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/network/RequestInterceptor.kt
@@ -0,0 +1,72 @@
+package co.optable.android_sdk.core.network
+
+import co.optable.BuildConfig
+import co.optable.android_sdk.OptableConfig
+import co.optable.android_sdk.core.ConsentsManager
+import co.optable.android_sdk.core.LocalStorage
+import co.optable.android_sdk.core.UserAgentHolder
+import okhttp3.Interceptor
+import okhttp3.Response
+
+internal class RequestInterceptor(
+    private val config: OptableConfig,
+    private val storage: LocalStorage,
+    private val userAgentHolder: UserAgentHolder,
+    private val consentsManager: ConsentsManager,
+) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+
+        val builder = originalRequest.url.newBuilder()
+            .addQueryParameter("osdk", "android-${BuildConfig.VERSION_NAME}-${BuildConfig.VERSION_CODE}")
+            .addQueryParameter("t", config.tenant)
+            .addQueryParameter("o", config.originSlug)
+
+        val subjectToGdpr = consentsManager.subjectToGdpr()
+        if (subjectToGdpr != null) {
+            builder.addQueryParameter("gdpr", if (subjectToGdpr) "1" else "0")
+        }
+
+        val gdprConsent = consentsManager.gdprConsent()
+        if (gdprConsent != null) {
+            builder.addQueryParameter("gdpr_consent", gdprConsent)
+        }
+
+        val gppConsent = consentsManager.gppConsent()
+        if (gppConsent != null) {
+            builder.addQueryParameter("gpp", gppConsent)
+        }
+
+        val gppSid = consentsManager.gppSid()
+        if (gppSid != null) {
+            builder.addQueryParameter("gpp_sid", gppSid)
+        }
+
+        val regulation = consentsManager.customRegulation()
+        if (regulation != null) {
+            builder.addQueryParameter("reg", regulation)
+        }
+
+        val url = builder.build()
+
+        val modifiedRequest = originalRequest.newBuilder().url(url)
+        modifiedRequest.addHeader("Accept", "application/json")
+
+        val apiKey = config.apiKey
+        if (apiKey != null) {
+            modifiedRequest.addHeader("Authorization", "Bearer $apiKey")
+        }
+
+        val userAgent = userAgentHolder.getUserAgent()
+        if (userAgent != null) {
+            modifiedRequest.addHeader("User-Agent", userAgent)
+        }
+
+        val pass = storage.getPassport()
+        if (pass != null) {
+            modifiedRequest.addHeader("X-Optable-Visitor", pass)
+        }
+
+        return chain.proceed(modifiedRequest.build())
+    }
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/network/ResponseInterceptor.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/network/ResponseInterceptor.kt
new file mode 100644
index 0000000..453f2b6
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/network/ResponseInterceptor.kt
@@ -0,0 +1,20 @@
+package co.optable.android_sdk.core.network
+
+import co.optable.android_sdk.core.LocalStorage
+import okhttp3.Interceptor
+import okhttp3.Response
+
+internal class ResponseInterceptor(
+    private val storage: LocalStorage,
+) : Interceptor {
+
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalResponse = chain.proceed(chain.request())
+        val pass = originalResponse.header("X-Optable-Visitor")
+        if (pass != null) {
+            storage.setPassport(pass)
+        }
+        return originalResponse.newBuilder().build()
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/EdgeService.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/EdgeService.kt
new file mode 100644
index 0000000..0dc1ff1
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/EdgeService.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2020 Optable Technologies Inc. All rights reserved.
+ * See LICENSE for details.
+ */
+package co.optable.android_sdk.core.network.edge
+
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+interface EdgeService {
+
+    @GET("targeting")
+    suspend fun targeting(@Query("id") idList: List<String>): Response<TargetingResponse>
+
+    @POST("identify")
+    suspend fun identify(@Body idList: List<String>): Response<Unit>
+
+    @POST("profile")
+    suspend fun profile(@Body profileBody: HashMap<String, Any>): Response<Unit>
+
+    @POST("witness")
+    suspend fun witness(@Body witnessBody: HashMap<String, Any>): Response<Unit>
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/TargetingResponse.kt b/android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/TargetingResponse.kt
new file mode 100644
index 0000000..912913a
--- /dev/null
+++ b/android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/TargetingResponse.kt
@@ -0,0 +1,19 @@
+package co.optable.android_sdk.core.network.edge
+
+import com.google.gson.JsonElement
+
+data class TargetingResponse(
+    val audience: List<Audience>?,
+    val ortb2: JsonElement?,
+) {
+
+    data class Audience(
+        val provider: String?,
+        val ids: List<AudienceId>?,
+    )
+
+    data class AudienceId(
+        val id: String?,
+    )
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponse.kt b/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponse.kt
deleted file mode 100644
index 957e7f9..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk.edge
-
-import java.io.IOException
-
-sealed class EdgeResponse<out T: Any, out U: Any> {
-    /**
-     * Success response with body
-     */
-    data class Success<T : Any>(val body: T) : EdgeResponse<T, Nothing>()
-
-    /**
-     * Failure response with body
-     */
-    data class ApiError<U: Any>(val body: U, val code: Int): EdgeResponse<Nothing, U>()
-
-    /**
-     * Network error
-     */
-    data class NetworkError(val error: IOException) : EdgeResponse<Nothing, Nothing>()
-
-    /**
-     * For example, json parsing error
-     */
-    data class UnknownError(val error: Throwable?) : EdgeResponse<Nothing, Nothing>()
-}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseAdapter.kt b/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseAdapter.kt
deleted file mode 100644
index e8a33e3..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseAdapter.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk.edge
-
-import okhttp3.ResponseBody
-import retrofit2.Call
-import retrofit2.CallAdapter
-import retrofit2.Converter
-import java.lang.reflect.Type
-
-internal class EdgeResponseAdapter<S : Any, E : Any>(
-    private val successType: Type,
-    private val errorBodyConverter: Converter<ResponseBody, E>
-) : CallAdapter<S, Call<EdgeResponse<S, E>>> {
-
-    override fun responseType(): Type = successType
-
-    override fun adapt(call: Call<S>): Call<EdgeResponse<S, E>> {
-        return EdgeResponseCall(call, errorBodyConverter)
-    }
-}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseAdapterFactory.kt b/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseAdapterFactory.kt
deleted file mode 100644
index 2bb7734..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseAdapterFactory.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk.edge
-
-import retrofit2.Call
-import retrofit2.CallAdapter
-import retrofit2.Retrofit
-import java.lang.reflect.ParameterizedType
-import java.lang.reflect.Type
-
-internal class EdgeResponseAdapterFactory : CallAdapter.Factory() {
-
-    override fun get(
-        returnType: Type,
-        annotations: Array<Annotation>,
-        retrofit: Retrofit
-    ): CallAdapter<*, *>? {
-
-        // suspend functions wrap the response type in `Call`
-        if (Call::class.java != getRawType(returnType)) {
-            return null
-        }
-
-        // check first that the return type is `ParameterizedType`
-        check(returnType is ParameterizedType) {
-            "return type must be parameterized as Call<EdgeResponse<<Foo>> or Call<EdgeResponse<out Foo>>"
-        }
-
-        // get the response type inside the `Call` type
-        val responseType = getParameterUpperBound(0, returnType)
-        // if the response type is not ApiResponse then we can't handle this type, so we return null
-        if (getRawType(responseType) != EdgeResponse::class.java) {
-            return null
-        }
-
-        // the response type is ApiResponse and should be parameterized
-        check(responseType is ParameterizedType) { "Response must be parameterized as EdgeResponse<Foo> or EdgeResponse<out Foo>" }
-
-        val successBodyType = getParameterUpperBound(0, responseType)
-        val errorBodyType = getParameterUpperBound(1, responseType)
-
-        val errorBodyConverter =
-            retrofit.nextResponseBodyConverter<Any>(null, errorBodyType, annotations)
-
-        return EdgeResponseAdapter<Any, Any>(successBodyType, errorBodyConverter)
-    }
-}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseCall.kt b/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseCall.kt
deleted file mode 100644
index eb98240..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeResponseCall.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk.edge
-
-import okhttp3.Request
-import okhttp3.ResponseBody
-import okio.Timeout
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Converter
-import retrofit2.Response
-import java.io.IOException
-
-internal class EdgeResponseCall<S : Any, E : Any>(
-    private val delegate: Call<S>,
-    private val errorConverter: Converter<ResponseBody, E>
-) : Call<EdgeResponse<S, E>> {
-
-    override fun enqueue(callback: Callback<EdgeResponse<S, E>>) {
-        return delegate.enqueue(object : Callback<S> {
-            override fun onResponse(call: Call<S>, response: Response<S>) {
-                val body = response.body()
-                val code = response.code()
-                val error = response.errorBody()
-
-                if (response.isSuccessful) {
-                    if (body != null) {
-                        callback.onResponse(
-                            this@EdgeResponseCall,
-                            Response.success(EdgeResponse.Success(body))
-                        )
-                    } else {
-                        // Response is successful but the body is null
-                        callback.onResponse(
-                            this@EdgeResponseCall,
-                            Response.success(EdgeResponse.UnknownError(null))
-                        )
-                    }
-                } else {
-                    val errorBody = when {
-                        error == null -> null
-                        error.contentLength() == 0L -> null
-                        else -> try {
-                            errorConverter.convert(error)
-                        } catch (ex: Exception) {
-                            null
-                        }
-                    }
-                    if (errorBody != null) {
-                        callback.onResponse(
-                            this@EdgeResponseCall,
-                            Response.success(EdgeResponse.ApiError(errorBody, code))
-                        )
-                    } else {
-                        callback.onResponse(
-                            this@EdgeResponseCall,
-                            Response.success(EdgeResponse.UnknownError(null))
-                        )
-                    }
-                }
-            }
-
-            override fun onFailure(call: Call<S>, throwable: Throwable) {
-                val edgeResponse = when (throwable) {
-                    is IOException -> EdgeResponse.NetworkError(throwable)
-                    else -> EdgeResponse.UnknownError(throwable)
-                }
-                callback.onResponse(this@EdgeResponseCall, Response.success(edgeResponse))
-            }
-        })
-    }
-
-    override fun isExecuted() = delegate.isExecuted
-
-    override fun clone() = EdgeResponseCall(delegate.clone(), errorConverter)
-
-    override fun isCanceled() = delegate.isCanceled
-
-    override fun cancel() = delegate.cancel()
-
-    override fun execute(): Response<EdgeResponse<S, E>> {
-        throw UnsupportedOperationException("EdgeResponseCall doesn't support execute")
-    }
-
-    override fun request(): Request = delegate.request()
-
-    override fun timeout(): Timeout {
-        return delegate.timeout()
-    }
-}
\ No newline at end of file
diff --git a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeService.kt b/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeService.kt
deleted file mode 100644
index 0106f5f..0000000
--- a/android_sdk/src/main/java/co/optable/android_sdk/edge/EdgeService.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk.edge
-
-import co.optable.android_sdk.*
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Path
-
-interface EdgeService {
-
-    @POST("/{app}/identify")
-    suspend fun Identify(@Path("app") app: String, @Body idList: OptableIdentifyInput):
-            EdgeResponse<OptableIdentifyResponse, OptableSDK.Response.Error>
-
-    @POST("/{app}/profile")
-    suspend fun Profile(@Path("app") app: String,
-                        @Body profileBody: HashMap<String,Any>):
-            EdgeResponse<OptableProfileResponse, OptableSDK.Response.Error>
-
-    @GET("/{app}/targeting")
-    suspend fun Targeting(@Path("app") app: String):
-            EdgeResponse<OptableTargetingResponse, OptableSDK.Response.Error>
-
-    @POST("/{app}/witness")
-    suspend fun Witness(@Path("app") app: String,
-                        @Body witnessBody: HashMap<String,Any>):
-            EdgeResponse<OptableWitnessResponse, OptableSDK.Response.Error>
-
-}
\ No newline at end of file
diff --git a/android_sdk/src/test/java/co/optable/android_sdk/OptableIdentifiersTest.kt b/android_sdk/src/test/java/co/optable/android_sdk/OptableIdentifiersTest.kt
new file mode 100644
index 0000000..2101bca
--- /dev/null
+++ b/android_sdk/src/test/java/co/optable/android_sdk/OptableIdentifiersTest.kt
@@ -0,0 +1,394 @@
+package co.optable.android_sdk
+
+import co.optable.android_sdk.core.GoogleAdIdManager
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.security.MessageDigest
+import java.util.*
+
+class OptableIdentifiersTest {
+
+    @Test
+    fun `generateEnrichedIds empty`() {
+        val ids = OptableIdentifiers()
+        val actual = ids.generateEnrichedIds()
+        assertEquals(emptyList<String>(), actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds email`() {
+        val ids = OptableIdentifiers(email = "  John.DOE+test@example.COM  ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("e:${sha256(normalize("  John.DOE+test@example.COM  "))}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds phoneNumber`() {
+        val ids = OptableIdentifiers(phoneNumber = " +1  (555)  123  45 67 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("p:${sha256(normalize(" +1  (555)  123  45 67 "))}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds postalCode`() {
+        val ids = OptableIdentifiers(postalCode = " 12 3 45 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("z:${normalize(" 12 3 45 ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds ipv4Address`() {
+        val ids = OptableIdentifiers(ipv4Address = " 192.168. 0. 1 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("i4:${removeWhitespaces(" 192.168. 0. 1 ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds ipv6Address`() {
+        val ids = OptableIdentifiers(ipv6Address = " 2001:DB8:: 1 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("i6:${normalize(" 2001:DB8:: 1 ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds appleIdfa`() {
+        val ids = OptableIdentifiers(appleIdfa = " A1B2C3D4-E5F6-7890-ABCD-EF0123456789 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("a:${normalize(" A1B2C3D4-E5F6-7890-ABCD-EF0123456789 ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds googleGaid`() {
+        val ids = OptableIdentifiers(googleGaid = " 38400000-8cf0-11bd-b23e-10b96e40000d ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("g:${normalize(" 38400000-8cf0-11bd-b23e-10b96e40000d ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds rokuRida`() {
+        val ids = OptableIdentifiers(rokuRida = " ROKU-RIDA- 123 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("r:${normalize(" ROKU-RIDA- 123 ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds samsungTifa`() {
+        val ids = OptableIdentifiers(samsungTifa = " TIFA  ABC ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("s:${normalize(" TIFA  ABC ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds amazonFireAfai`() {
+        val ids = OptableIdentifiers(amazonFireAfai = " AFAI  XYZ ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("f:${normalize(" AFAI  XYZ ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds netId`() {
+        val ids = OptableIdentifiers(netId = " net id  123 ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("n:${removeWhitespaces(" net id  123 ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds id5`() {
+        val ids = OptableIdentifiers(id5 = " id5   token ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("id5:${removeWhitespaces(" id5   token ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds utiq`() {
+        val ids = OptableIdentifiers(utiq = " UTIQ  VALUE ")
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("utiq:${normalize(" UTIQ  VALUE ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds custom vid`() {
+        val ids = OptableIdentifiers(custom = mapOf("v" to "  vid value  "))
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("v:${removeWhitespaces("  vid value  ")}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds custom nonVid`() {
+        val ids = OptableIdentifiers(custom = mapOf("c1" to "  custom one  "))
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("c1:${"  custom one  ".trim()}")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds raw`() {
+        val ids = OptableIdentifiers(raw = listOf("raw:alreadyEncoded", "custom:any"))
+        val actual = ids.generateEnrichedIds()
+        val expected = listOf("raw:alreadyEncoded", "custom:any")
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds adds GAID from GoogleAdIdManager when googleGaid is null and receiveGaidAutomatically is true`() {
+        val previousAdId = GoogleAdIdManager.adId
+        try {
+            GoogleAdIdManager.adId = " 38400000-8CF0-11BD-b23e-10B96e40000D "
+
+            val ids = OptableIdentifiers(
+                googleGaid = null,
+                receiveGaidAutomatically = true
+            )
+
+            val actual = ids.generateEnrichedIds()
+            val expected = listOf("g:${normalize(" 38400000-8CF0-11BD-b23e-10B96e40000D ")}")
+            assertEquals(expected, actual)
+        } finally {
+            GoogleAdIdManager.adId = previousAdId
+        }
+    }
+
+    @Test
+    fun `generateEnrichedIds does not add GAID from GoogleAdIdManager when googleGaid is set even if receiveGaidAutomatically is true`() {
+        val previousAdId = GoogleAdIdManager.adId
+        try {
+            GoogleAdIdManager.adId = " 38400000-8cf0-11bd-b23e-10b96e40000d "
+
+            val ids = OptableIdentifiers(
+                googleGaid = " USER-PROVIDED-GAID ",
+                receiveGaidAutomatically = true
+            )
+
+            val actual = ids.generateEnrichedIds()
+            val expected = listOf("g:${normalize(" USER-PROVIDED-GAID ")}")
+            assertEquals(expected, actual)
+        } finally {
+            GoogleAdIdManager.adId = previousAdId
+        }
+    }
+
+    @Test
+    fun `generateEnrichedIds does not add GAID from GoogleAdIdManager when receiveGaidAutomatically is false`() {
+        val previousAdId = GoogleAdIdManager.adId
+        try {
+            GoogleAdIdManager.adId = " 38400000-8cf0-11bd-b23e-10b96e40000d "
+
+            val ids = OptableIdentifiers(
+                googleGaid = null,
+                receiveGaidAutomatically = false
+            )
+
+            val actual = ids.generateEnrichedIds()
+            assertEquals(emptyList<String>(), actual)
+        } finally {
+            GoogleAdIdManager.adId = previousAdId
+        }
+    }
+
+
+    @Test
+    fun `generateEnrichedIds, all fields, same values`() {
+        val email = "john.doe+test@example.com"
+        val phone = "+1(555)1234567"
+        val postal = "12345"
+        val ipv4 = "192.168.0.1"
+        val ipv6 = "2001:db8::1"
+        val idfa = "a1b2c3d4-e5f6-7890-abcd-ef0123456789"
+        val gaid = "38400000-8cf0-11bd-b23e-10b96e40000d"
+        val rida = "roku-rida-123"
+        val tifa = "tifaabc"
+        val afai = "afaixyz"
+        val netId = "netid123"
+        val id5 = "id5token"
+        val utiq = "utiqvalue"
+        val vid = "vidvalue"
+        val c1 = "custom one"
+        val raw1 = "raw:alreadyEncoded"
+        val raw2 = "x:someRawValue"
+
+        val ids = OptableIdentifiers(
+            email = email,
+            phoneNumber = phone,
+            postalCode = postal,
+            ipv4Address = ipv4,
+            ipv6Address = ipv6,
+            appleIdfa = idfa,
+            googleGaid = gaid,
+            rokuRida = rida,
+            samsungTifa = tifa,
+            amazonFireAfai = afai,
+            netId = netId,
+            id5 = id5,
+            utiq = utiq,
+            custom = mapOf(
+                "v" to vid,
+                "c1" to c1
+            ),
+            receiveGaidAutomatically = true,
+            raw = listOf(raw1, raw2)
+        )
+
+        val actual = ids.generateEnrichedIds()
+
+        val expected = listOf(
+            "e:${sha256(email)}",
+            "p:${sha256(phone)}",
+            "z:$postal",
+            "i4:$ipv4",
+            "i6:$ipv6",
+            "a:$idfa",
+            "g:$gaid",
+            "r:$rida",
+            "s:$tifa",
+            "f:$afai",
+            "n:$netId",
+            "id5:$id5",
+            "utiq:$utiq",
+            "v:$vid",
+            "c1:$c1",
+            raw1,
+            raw2
+        )
+
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `generateEnrichedIds, all fields, different case and whitespaces`() {
+        val ids = OptableIdentifiers(
+            email = "  John.DOE+test@example.COM  ",
+            phoneNumber = " +1  (555)  123  45 67 ",
+            postalCode = " 12 3 45 ",
+            ipv4Address = " 192.168. 0. 1 ",
+            ipv6Address = " 2001:DB8:: 1 ",
+            appleIdfa = " A1B2C3D4-E5F6-7890-ABCD-EF0123456789 ",
+            googleGaid = " 38400000-8cf0-11bd-b23e-10b96e40000d ",
+            rokuRida = " ROKU-RIDA- 123 ",
+            samsungTifa = " TIFA  ABC ",
+            amazonFireAfai = " AFAI  XYZ ",
+            netId = " net id  123 ",
+            id5 = " id5   token ",
+            utiq = " UTIQ  VALUE ",
+            custom = mapOf(
+                "v" to "  vid value  ",
+                "c1" to "  custom one  "
+            ),
+            raw = listOf(
+                "raw:alreadyEncoded",
+                "x:someRawValue"
+            ),
+            receiveGaidAutomatically = true,
+        )
+
+        val actual = ids.generateEnrichedIds()
+
+        val expected = listOf(
+            "e:${sha256(normalize("  John.DOE+test@Example.COM  "))}",
+            "p:${sha256(normalize(" +1  (555)  123  45 67 "))}",
+            "z:${normalize(" 12 3 45 ")}",
+            "i4:${removeWhitespaces(" 192.168. 0. 1 ")}",
+            "i6:${normalize(" 2001:DB8:: 1 ")}",
+            "a:${normalize(" A1B2C3D4-E5F6-7890-ABCD-EF0123456789 ")}",
+            "g:${normalize(" 38400000-8cf0-11bd-b23e-10b96e40000d ")}",
+            "r:${normalize(" ROKU-RIDA- 123 ")}",
+            "s:${normalize(" TIFA  ABC ")}",
+            "f:${normalize(" AFAI  XYZ ")}",
+            "n:${removeWhitespaces(" net id  123 ")}",
+            "id5:${removeWhitespaces(" id5   token ")}",
+            "utiq:${normalize(" UTIQ  VALUE ")}",
+            "v:${removeWhitespaces("  vid value  ")}",
+            "c1:${"  custom one  ".trim()}",
+            "raw:alreadyEncoded",
+            "x:someRawValue"
+        )
+
+        assertEquals(expected, actual)
+    }
+
+
+    @Test
+    fun `generateEnrichedIds, all fields, builder`() {
+        val built = OptableIdentifiers.Builder()
+            .email("  John.DOE+test@example.COM  ")
+            .phoneNumber(" +1  (555)  123  45 67 ")
+            .postalCode(" 12 3 45 ")
+            .ipv4Address(" 192.168. 0. 1 ")
+            .ipv6Address(" 2001:DB8:: 1 ")
+            .appleIdfa(" A1B2C3D4-E5F6-7890-ABCD-EF0123456789 ")
+            .googleGaid(" 38400000-8cf0-11bd-b23e-10b96e40000d ")
+            .rokuRida(" ROKU-RIDA- 123 ")
+            .samsungTifa(" TIFA  ABC ")
+            .amazonFireAfai(" AFAI  XYZ ")
+            .netId(" net id  123 ")
+            .id5(" id5   token ")
+            .utiq(" UTIQ  VALUE ")
+            .custom(
+                mapOf(
+                    "v" to "  vid value  ",
+                    "c1" to "  custom one  "
+                )
+            )
+            .raw(
+                listOf(
+                    "raw:alreadyEncoded",
+                    "x:someRawValue"
+                )
+            )
+            .receiveGaidAutomatically(true)
+            .build()
+
+        val direct = OptableIdentifiers(
+            email = "  John.DOE+test@example.COM  ",
+            phoneNumber = " +1  (555)  123  45 67 ",
+            postalCode = " 12 3 45 ",
+            ipv4Address = " 192.168. 0. 1 ",
+            ipv6Address = " 2001:DB8:: 1 ",
+            appleIdfa = " A1B2C3D4-E5F6-7890-ABCD-EF0123456789 ",
+            googleGaid = " 38400000-8cf0-11bd-b23e-10b96e40000d ",
+            rokuRida = " ROKU-RIDA- 123 ",
+            samsungTifa = " TIFA  ABC ",
+            amazonFireAfai = " AFAI  XYZ ",
+            netId = " net id  123 ",
+            id5 = " id5   token ",
+            utiq = " UTIQ  VALUE ",
+            custom = mapOf(
+                "v" to "  vid value  ",
+                "c1" to "  custom one  "
+            ),
+            raw = listOf(
+                "raw:alreadyEncoded",
+                "x:someRawValue"
+            ),
+            receiveGaidAutomatically = true,
+        )
+
+        assertEquals(direct, built)
+        assertEquals(direct.generateEnrichedIds(), built.generateEnrichedIds())
+    }
+
+    private fun sha256(value: String): String {
+        val bytes = value.toByteArray(Charsets.UTF_8)
+        val digest = MessageDigest.getInstance("SHA-256").digest(bytes)
+        return digest.joinToString("") { "%02x".format(it) }
+    }
+
+    private fun normalize(value: String): String =
+        value.replace("\\s+".toRegex(), "").lowercase(Locale.ROOT)
+
+    private fun removeWhitespaces(value: String): String =
+        value.replace("\\s+".toRegex(), "")
+}
\ No newline at end of file
diff --git a/android_sdk/src/test/java/co/optable/android_sdk/OptableSDKUnitTest.kt b/android_sdk/src/test/java/co/optable/android_sdk/OptableSDKUnitTest.kt
deleted file mode 100644
index 6ebe448..0000000
--- a/android_sdk/src/test/java/co/optable/android_sdk/OptableSDKUnitTest.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright © 2020 Optable Technologies Inc. All rights reserved.
- * See LICENSE for details.
- */
-package co.optable.android_sdk
-
-import android.net.Uri
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-
-/**
- * OptableSDK unit tests
- */
-@RunWith(RobolectricTestRunner::class)
-class OptableSDKUnitTest {
-
-    @Test
-    fun eid_isCorrect() {
-        val expected = "e:a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
-
-        assertEquals(expected, OptableSDK.eid("123"))
-        assertEquals(expected, OptableSDK.eid(" 123"))
-        assertEquals(expected, OptableSDK.eid("123 "))
-        assertEquals(expected, OptableSDK.eid(" 123 "))
-    }
-
-    @Test
-    fun eid_ignoresCase() {
-        val var1 = "tEsT@FooBarBaz.CoM"
-        val var2 = "test@foobarbaz.com"
-        val var3 = "TEST@FOOBARBAZ.COM"
-        val var4 = "TeSt@fOObARbAZ.cOm"
-        val eid = OptableSDK.eid(var1)
-
-        assertEquals(eid, OptableSDK.eid(var2))
-        assertEquals(eid, OptableSDK.eid(var3))
-        assertEquals(eid, OptableSDK.eid(var4))
-    }
-
-    @Test
-    fun gaid_isCorrectAndIgnoresCase() {
-        val expected = "g:38400000-8cf0-11bd-b23e-10b96e40000d"
-
-        assertEquals(expected, OptableSDK.gaid("38400000-8cf0-11bd-b23e-10b96e40000d"))
-        assertEquals(expected, OptableSDK.gaid("  38400000-8cf0-11bd-b23e-10b96e40000d"))
-        assertEquals(expected, OptableSDK.gaid("38400000-8cf0-11bd-b23e-10b96e40000d  "))
-        assertEquals(expected, OptableSDK.gaid("  38400000-8cf0-11bd-b23e-10b96e40000d  "))
-        assertEquals(expected, OptableSDK.gaid("38400000-8CF0-11BD-B23E-10B96E40000D"))
-    }
-
-    @Test
-    fun cid_isCorrect() {
-        val expected = "c:FooBarBAZ-01234#98765.!!!"
-
-        assertEquals(expected, OptableSDK.cid("FooBarBAZ-01234#98765.!!!"))
-        assertEquals(expected, OptableSDK.cid(" FooBarBAZ-01234#98765.!!!"))
-        assertEquals(expected, OptableSDK.cid("FooBarBAZ-01234#98765.!!!  "))
-        assertEquals(expected, OptableSDK.cid("  FooBarBAZ-01234#98765.!!!  "))
-    }
-
-    @Test
-    fun cid_isCaseSensitive() {
-        val unexpected = "c:FooBarBAZ-01234#98765.!!!"
-
-        assertNotEquals(unexpected, OptableSDK.cid("foobarBAZ-01234#98765.!!!"))
-    }
-
-    @Test
-    fun eidFromURI_isCorrect() {
-        val url = "http://some.domain.com/some/path?some=query&something=else&oeid=a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3&foo=bar&baz"
-        val expected = "e:a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
-
-        assertEquals(expected, OptableSDK.eidFromURI(Uri.parse(url)))
-    }
-
-    @Test
-    fun eidFromURI_returnsEmptyWhenOeidAbsentFromQuerystr() {
-        val url = "http://some.domain.com/some/path?some=query&something=else"
-        val expected = ""
-
-        assertEquals(expected, OptableSDK.eidFromURI(Uri.parse(url)))
-    }
-
-    @Test
-    fun eidFromURI_returnsEmptyWhenQuerystrAbsent() {
-        val url = "http://some.domain.com/some/path"
-        val expected = ""
-
-        assertEquals(expected, OptableSDK.eidFromURI(Uri.parse(url)))
-    }
-
-    @Test
-    fun eidFromURI_returnsEmptyWhenInputEmptyString() {
-        val url = ""
-        val expected = ""
-
-        assertEquals(expected, OptableSDK.eidFromURI(Uri.parse(url)))
-    }
-
-    @Test
-    fun eidFromURI_expectsSHA256() {
-        val url = "http://some.domain.com/some/path?some=query&something=else&oeid=AAAAAAAa665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3&foo=bar&baz"
-        val expected = ""
-
-        assertEquals(expected, OptableSDK.eidFromURI(Uri.parse(url)))
-    }
-
-    @Test
-    fun eidFromURI_ignoresCase() {
-        val url = "http://some.domain.com/some/path?some=query&something=else&oEId=A665A45920422F9D417E4867EFDC4FB8A04A1F3FFF1FA07E998E86f7f7A27AE3&foo=bar&baz"
-        val expected = "e:a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
-
-        assertEquals(expected, OptableSDK.eidFromURI(Uri.parse(url)))
-    }
-}
\ No newline at end of file
diff --git a/android_sdk/src/test/java/co/optable/android_sdk/core/IdentifiersEncoderTest.kt b/android_sdk/src/test/java/co/optable/android_sdk/core/IdentifiersEncoderTest.kt
new file mode 100644
index 0000000..e61d0a1
--- /dev/null
+++ b/android_sdk/src/test/java/co/optable/android_sdk/core/IdentifiersEncoderTest.kt
@@ -0,0 +1,130 @@
+package co.optable.android_sdk.core
+
+import co.optable.android_sdk.OptableIdentifiers
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [35])
+class IdentifiersEncoderTest {
+
+    @Test
+    fun eid_isCorrect() {
+        val expected = "e:a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
+
+        assertEquals(expected, encode(OptableIdentifiers(email = "123")))
+        assertEquals(expected, encode(OptableIdentifiers(email = " 123")))
+        assertEquals(expected, encode(OptableIdentifiers(email = "123 ")))
+        assertEquals(expected, encode(OptableIdentifiers(email = " 123 ")))
+    }
+
+    @Test
+    fun `phoneNumber is encrypted`() {
+        val expected = "e:97ed57b6d666c803e1d0a74b0e3ecc5157f23c02800d007f2e4b8b2fabea8dbb"
+
+        assertEquals(expected, encode(OptableIdentifiers(email = "+123467890")))
+        assertEquals(expected, encode(OptableIdentifiers(email = " +123467890")))
+        assertEquals(expected, encode(OptableIdentifiers(email = "+123467890 ")))
+        assertEquals(expected, encode(OptableIdentifiers(email = " +123467890 ")))
+    }
+
+    @Test
+    fun eid_ignoresCase() {
+        val var1 = "tEsT@FooBarBaz.CoM"
+        val var2 = "test@foobarbaz.com"
+        val var3 = "TEST@FOOBARBAZ.COM"
+        val var4 = "TeSt@fOObARbAZ.cOm"
+        val eid = encode(OptableIdentifiers(email = var1))
+
+        assertEquals(eid, encode(OptableIdentifiers(email = var2)))
+        assertEquals(eid, encode(OptableIdentifiers(email = var3)))
+        assertEquals(eid, encode(OptableIdentifiers(email = var4)))
+    }
+
+    @Test
+    fun gaid_isCorrectAndIgnoresCase() {
+        val expected = "g:38400000-8cf0-11bd-b23e-10b96e40000d"
+
+        assertEquals(expected, encode(OptableIdentifiers(googleGaid = "38400000-8cf0-11bd-b23e-10b96e40000d")))
+        assertEquals(expected, encode(OptableIdentifiers(googleGaid = "  38400000-8cf0-11bd-b23e-10b96e40000d")))
+        assertEquals(expected, encode(OptableIdentifiers(googleGaid = "38400000-8cf0-11bd-b23e-10b96e40000d  ")))
+        assertEquals(expected, encode(OptableIdentifiers(googleGaid = "  38400000-8cf0-11bd-b23e-10b96e40000d  ")))
+        assertEquals(expected, encode(OptableIdentifiers(googleGaid = "38400000-8CF0-11BD-B23E-10B96E40000D")))
+    }
+
+    @Test
+    fun cid_isCorrect() {
+        val expected = "c:FooBarBAZ-01234#98765.!!!"
+
+
+        assertEquals(expected, encode(OptableIdentifiers(custom = mapOf("c" to "FooBarBAZ-01234#98765.!!!"))))
+        assertEquals(expected, encode(OptableIdentifiers(custom = mapOf("c" to " FooBarBAZ-01234#98765.!!!"))))
+        assertEquals(expected, encode(OptableIdentifiers(custom = mapOf("c" to "FooBarBAZ-01234#98765.!!!  "))))
+        assertEquals(expected, encode(OptableIdentifiers(custom = mapOf("c" to "  FooBarBAZ-01234#98765.!!!  "))))
+    }
+
+    @Test
+    fun cid_isCaseSensitive() {
+        val unexpected = "c:FooBarBAZ-01234#98765.!!!"
+
+        val actual = encode(OptableIdentifiers(custom = mapOf("c" to "foobarBAZ-01234#98765.!!!")))
+        assertNotEquals(unexpected, actual)
+    }
+
+    @Test
+    fun eidFromUrl_isCorrect() {
+        val url =
+            "http://some.domain.com/some/path?some=query&something=else&oeid=a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3&foo=bar&baz"
+        val expected = "e:a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
+
+        assertEquals(expected, IdentifiersEncoder.eidFromUrl(url))
+    }
+
+    @Test
+    fun eidFromUrl_returnsEmptyWhenOeidAbsentFromQuerystr() {
+        val url = "http://some.domain.com/some/path?some=query&something=else"
+
+        assertNull(IdentifiersEncoder.eidFromUrl(url))
+    }
+
+    @Test
+    fun eidFromURI_returnsEmptyWhenQuerystrAbsent() {
+        val url = "http://some.domain.com/some/path"
+
+        assertNull(IdentifiersEncoder.eidFromUrl(url))
+    }
+
+    @Test
+    fun eidFromURI_returnsEmptyWhenInputEmptyString() {
+        val url = ""
+
+        assertNull(IdentifiersEncoder.eidFromUrl(url))
+    }
+
+    @Test
+    fun eidFromURI_expectsSHA256() {
+        val url =
+            "http://some.domain.com/some/path?some=query&something=else&oeid=AAAAAAAa665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3&foo=bar&baz"
+
+        assertNull(IdentifiersEncoder.eidFromUrl(url))
+    }
+
+    @Test
+    fun eidFromURI_ignoresCase() {
+        val url =
+            "http://some.domain.com/some/path?some=query&something=else&oEId=A665A45920422F9D417E4867EFDC4FB8A04A1F3FFF1FA07E998E86f7f7A27AE3&foo=bar&baz"
+        val expected = "e:a665a45920422f9d417e4867efdc4fb8a04a1f3fff1fa07e998e86f7f7a27ae3"
+
+        assertEquals(expected, IdentifiersEncoder.eidFromUrl(url))
+    }
+
+    private fun encode(ids: OptableIdentifiers): String {
+        val enrichedIds = ids.generateEnrichedIds()
+        assertEquals("This method checks only 1 string", 1, enrichedIds.size)
+        return enrichedIds.first()
+    }
+
+}
\ No newline at end of file
diff --git a/android_sdk/src/test/java/co/optable/android_sdk/core/MockWebServerTest.kt b/android_sdk/src/test/java/co/optable/android_sdk/core/MockWebServerTest.kt
new file mode 100644
index 0000000..be56cd9
--- /dev/null
+++ b/android_sdk/src/test/java/co/optable/android_sdk/core/MockWebServerTest.kt
@@ -0,0 +1,212 @@
+package co.optable.android_sdk.core
+
+import co.optable.BuildConfig
+import co.optable.android_sdk.OptableConfig
+import co.optable.android_sdk.core.network.RequestInterceptor
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.mockito.kotlin.times
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+
+class MockWebServerTest {
+
+    @Mock
+    private lateinit var config: OptableConfig
+
+    @Mock
+    private lateinit var storage: LocalStorage
+
+    @Mock
+    private lateinit var userAgentHolder: UserAgentHolder
+
+    @Mock
+    private lateinit var consentsManager: ConsentsManager
+
+    private lateinit var mockWebServer: MockWebServer
+    private lateinit var client: OkHttpClient
+    private lateinit var webServerUrl: HttpUrl
+    private lateinit var mocks: AutoCloseable
+
+    @Before
+    fun setUp() {
+        mocks = MockitoAnnotations.openMocks(this)
+        mockWebServer = MockWebServer()
+        mockWebServer.start()
+        mockWebServer.enqueue(MockResponse())
+        webServerUrl = mockWebServer.url("/")
+
+        whenever(consentsManager.subjectToGdpr()).thenReturn(null)
+        whenever(consentsManager.gdprConsent()).thenReturn(null)
+        whenever(consentsManager.gppConsent()).thenReturn(null)
+        whenever(consentsManager.gppSid()).thenReturn(null)
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+        mocks.close()
+    }
+
+    @Test
+    fun `only required fields`() {
+        whenever(config.tenant).thenReturn("tenant")
+        whenever(config.originSlug).thenReturn("originSlug")
+
+        val request = makeRequest().request
+
+        assertNull(request.headers["Authorization"])
+        assertNull(request.headers["X-Optable-Visitor"])
+        assertNull(request.headers["User-Agent"])
+
+        assertEquals("application/json", request.headers["Accept"])
+        assertEquals(
+            "android-" + BuildConfig.VERSION_NAME + "-" + BuildConfig.VERSION_CODE,
+            request.url.queryParameter("osdk")
+        )
+        assertEquals("tenant", request.url.queryParameter("t"))
+        assertEquals("originSlug", request.url.queryParameter("o"))
+    }
+
+    @Test
+    fun `optional header, api key`() {
+        whenever(config.apiKey).thenReturn("apiKey")
+
+        val request = makeRequest().request
+
+        assertEquals("Bearer apiKey", request.headers["Authorization"])
+    }
+
+    @Test
+    fun `optional header, passport`() {
+        whenever(storage.getPassport()).thenReturn("passport")
+
+        val request = makeRequest().request
+
+        assertEquals("passport", request.headers["X-Optable-Visitor"])
+    }
+
+    @Test
+    fun `complete request`() {
+        whenever(config.tenant).thenReturn("tenant")
+        whenever(config.originSlug).thenReturn("originSlug")
+        whenever(config.apiKey).thenReturn("apiKey")
+        whenever(storage.getPassport()).thenReturn("passport")
+        whenever(userAgentHolder.getUserAgent()).thenReturn("userAgent")
+
+        val request = makeRequest().request
+
+        assertEquals("application/json", request.headers["Accept"])
+        assertEquals("Bearer apiKey", request.headers["Authorization"])
+        verify(config, times(1)).apiKey
+        assertEquals("passport", request.headers["X-Optable-Visitor"])
+        verify(storage, times(1)).getPassport()
+        assertEquals("userAgent", request.headers["User-Agent"])
+        verify(userAgentHolder, times(1)).getUserAgent()
+
+        assertEquals(
+            "android-" + BuildConfig.VERSION_NAME + "-" + BuildConfig.VERSION_CODE,
+            request.url.queryParameter("osdk")
+        )
+        assertEquals("tenant", request.url.queryParameter("t"))
+        verify(config, times(1)).tenant
+        assertEquals("originSlug", request.url.queryParameter("o"))
+        verify(config, times(1)).originSlug
+    }
+
+    @Test
+    fun `full url test`() {
+        whenever(config.tenant).thenReturn("tenant")
+        whenever(config.originSlug).thenReturn("originSlug")
+
+        val request = makeRequest().request
+        val expectedQueryParams = "?osdk=android-${BuildConfig.VERSION_NAME}-${BuildConfig.VERSION_CODE}&t=tenant&o=originSlug"
+        assertEquals(webServerUrl.toString() + expectedQueryParams, request.url.toString())
+    }
+
+    @Test
+    fun `subject to GDPR, true`() {
+        whenever(consentsManager.subjectToGdpr()).thenReturn(true)
+
+        val request = makeRequest().request
+        assertEquals("1", request.url.queryParameter("gdpr"))
+    }
+
+    @Test
+    fun `subject to GDPR, false`() {
+        whenever(consentsManager.subjectToGdpr()).thenReturn(false)
+
+        val request = makeRequest().request
+        assertEquals("0", request.url.queryParameter("gdpr"))
+    }
+
+    @Test
+    fun `GDPR consent string`() {
+        whenever(consentsManager.gdprConsent()).thenReturn("gdpr_consent_string")
+
+        val request = makeRequest().request
+        assertEquals("gdpr_consent_string", request.url.queryParameter("gdpr_consent"))
+    }
+
+    @Test
+    fun `GPP consent string`() {
+        whenever(consentsManager.gppConsent()).thenReturn("gpp_consent_string")
+
+        val request = makeRequest().request
+        assertEquals("gpp_consent_string", request.url.queryParameter("gpp"))
+    }
+
+    @Test
+    fun `GPP sid`() {
+        whenever(consentsManager.gppSid()).thenReturn("gpp_sid")
+
+        val request = makeRequest().request
+        assertEquals("gpp_sid", request.url.queryParameter("gpp_sid"))
+    }
+
+    @Test
+    fun `custom regulation`() {
+        whenever(consentsManager.customRegulation()).thenReturn("regulation")
+
+        val request = makeRequest().request
+        assertEquals("regulation", request.url.queryParameter("reg"))
+    }
+
+    @Test
+    fun `all consents`() {
+        whenever(consentsManager.subjectToGdpr()).thenReturn(true)
+        whenever(consentsManager.gdprConsent()).thenReturn("gdpr_consent_string")
+        whenever(consentsManager.gppConsent()).thenReturn("gpp_consent_string")
+        whenever(consentsManager.gppSid()).thenReturn("gpp_sid")
+        whenever(consentsManager.customRegulation()).thenReturn("regulation")
+
+        val request = makeRequest().request
+        assertEquals("1", request.url.queryParameter("gdpr"))
+        assertEquals("gdpr_consent_string", request.url.queryParameter("gdpr_consent"))
+        assertEquals("gpp_consent_string", request.url.queryParameter("gpp"))
+        assertEquals("gpp_sid", request.url.queryParameter("gpp_sid"))
+        assertEquals("regulation", request.url.queryParameter("reg"))
+    }
+
+    private fun makeRequest(): Response {
+        val interceptor = RequestInterceptor(config, storage, userAgentHolder, consentsManager)
+        client = OkHttpClient.Builder()
+            .addInterceptor(interceptor)
+            .build()
+
+        val request = Request.Builder().url(webServerUrl).build()
+        return client.newCall(request).execute()
+    }
+
+}
diff --git a/android_sdk/src/test/java/co/optable/android_sdk/core/ResponseInterceptorTest.kt b/android_sdk/src/test/java/co/optable/android_sdk/core/ResponseInterceptorTest.kt
new file mode 100644
index 0000000..8109266
--- /dev/null
+++ b/android_sdk/src/test/java/co/optable/android_sdk/core/ResponseInterceptorTest.kt
@@ -0,0 +1,75 @@
+package co.optable.android_sdk.core
+
+import co.optable.android_sdk.core.network.ResponseInterceptor
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.MockitoAnnotations
+import org.mockito.kotlin.any
+import org.mockito.kotlin.never
+import org.mockito.kotlin.verify
+
+class ResponseInterceptorTest {
+
+    @Mock
+    private lateinit var storage: LocalStorage
+
+    private lateinit var mockWebServer: MockWebServer
+    private lateinit var client: OkHttpClient
+    private lateinit var webServerUrl: HttpUrl
+    private lateinit var mocks: AutoCloseable
+
+    @Before
+    fun setUp() {
+        mocks = MockitoAnnotations.openMocks(this)
+        mockWebServer = MockWebServer()
+        mockWebServer.start()
+        webServerUrl = mockWebServer.url("/")
+    }
+
+    @After
+    fun tearDown() {
+        mockWebServer.shutdown()
+        mocks.close()
+    }
+
+
+    @Test
+    fun `interceptor saves passport to storage`() {
+        makeRequest("passport")
+
+        verify(storage).setPassport("passport")
+    }
+
+    @Test
+    fun `interceptor ignores empty header`() {
+        makeRequest(null)
+
+        verify(storage, never()).setPassport(any())
+    }
+
+    private fun makeRequest(passport: String?): Response {
+        val response = MockResponse()
+        response.setResponseCode(200)
+        if (passport != null) {
+            response.setHeader("X-Optable-Visitor", passport)
+        }
+        mockWebServer.enqueue(response)
+
+        val responseInterceptor = ResponseInterceptor(storage)
+        client = OkHttpClient.Builder()
+            .addInterceptor(responseInterceptor)
+            .build()
+
+        val request = Request.Builder().url(webServerUrl).build()
+        return client.newCall(request).execute()
+    }
+
+}
\ No newline at end of file