diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.java b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.java
deleted file mode 100644
index 29587b6..0000000
--- a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.uid2.dev;
-
-import android.app.Application;
-import android.util.Log;
-
-import com.uid2.UID2Manager;
-
-public class GMADevApplication extends Application {
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        // Initialise the UID2Manager class. We will use it's DefaultNetworkSession rather than providing our own
-        // custom implementation. This can be done to allow wrapping something like OkHttp.
-        try {
-            UID2Manager.init(this.getApplicationContext());
-        } catch (Exception ex) {
-            Log.e("IMADevApplication", "Error initialising UID2Manager", ex);
-        }
-    }
-}
diff --git a/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.kt b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.kt
new file mode 100644
index 0000000..0b19a17
--- /dev/null
+++ b/securesignals-gma-dev-app/src/main/java/com/uid2/dev/GMADevApplication.kt
@@ -0,0 +1,23 @@
+package com.uid2.dev
+
+import android.app.Application
+import android.util.Log
+import com.uid2.UID2Manager
+
+class GMADevApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        // Initialise the UID2Manager class. We will use it's DefaultNetworkSession rather than providing our own
+        // custom implementation. This can be done to allow wrapping something like OkHttp.
+        try {
+            UID2Manager.init(
+                context = this,
+                isLoggingEnabled = true,
+            )
+        } catch (ex: Exception) {
+            Log.e("IMADevApplication", "Error initialising UID2Manager", ex)
+        }
+    }
+}
diff --git a/securesignals-gma/src/main/java/com/uid2/securesignals/gma/UID2MediationAdapter.kt b/securesignals-gma/src/main/java/com/uid2/securesignals/gma/UID2MediationAdapter.kt
index 5d51c03..8789ce8 100644
--- a/securesignals-gma/src/main/java/com/uid2/securesignals/gma/UID2MediationAdapter.kt
+++ b/securesignals-gma/src/main/java/com/uid2/securesignals/gma/UID2MediationAdapter.kt
@@ -45,7 +45,10 @@ public class UID2MediationAdapter : RtbAdapter() {
             UID2Manager.init(context)
         }
 
-        initializationCompleteCallback.onInitializationSucceeded()
+        // After we've asked to initialize the manager, we should wait until it's complete before reporting success.
+        // This will potentially allow any previously persisted identity to be fully restored before we allow any
+        // signals to be collected.
+        UID2Manager.getInstance().onInitialized = initializationCompleteCallback::onInitializationSucceeded
     }
 
     /**
diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.java b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.java
deleted file mode 100644
index d872cb5..0000000
--- a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.uid2.dev;
-
-import android.app.Application;
-import android.util.Log;
-
-import com.uid2.UID2Manager;
-
-public class IMADevApplication extends Application {
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-
-        // Initialise the UID2Manager class. We will use it's DefaultNetworkSession rather than providing our own
-        // custom implementation. This can be done to allow wrapping something like OkHttp.
-        try {
-            UID2Manager.init(this.getApplicationContext());
-        } catch (Exception ex) {
-            Log.e("IMADevApplication", "Error initialising UID2Manager", ex);
-        }
-    }
-}
diff --git a/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.kt b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.kt
new file mode 100644
index 0000000..ca15f09
--- /dev/null
+++ b/securesignals-ima-dev-app/src/main/java/com/uid2/dev/IMADevApplication.kt
@@ -0,0 +1,23 @@
+package com.uid2.dev
+
+import android.app.Application
+import android.util.Log
+import com.uid2.UID2Manager
+
+class IMADevApplication : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        // Initialise the UID2Manager class. We will use it's DefaultNetworkSession rather than providing our own
+        // custom implementation. This can be done to allow wrapping something like OkHttp.
+        try {
+            UID2Manager.init(
+                context = this,
+                isLoggingEnabled = true,
+            )
+        } catch (ex: Exception) {
+            Log.e("IMADevApplication", "Error initialising UID2Manager", ex)
+        }
+    }
+}
diff --git a/securesignals-ima/src/main/java/com/uid2/securesignals/ima/UID2SecureSignalsAdapter.kt b/securesignals-ima/src/main/java/com/uid2/securesignals/ima/UID2SecureSignalsAdapter.kt
index c595fc2..6939f0c 100644
--- a/securesignals-ima/src/main/java/com/uid2/securesignals/ima/UID2SecureSignalsAdapter.kt
+++ b/securesignals-ima/src/main/java/com/uid2/securesignals/ima/UID2SecureSignalsAdapter.kt
@@ -41,7 +41,10 @@ public class UID2SecureSignalsAdapter : SecureSignalsAdapter {
             UID2Manager.init(context)
         }
 
-        callback.onSuccess()
+        // After we've asked to initialize the manager, we should wait until it's complete before reporting success.
+        // This will potentially allow any previously persisted identity to be fully restored before we allow any
+        // signals to be collected.
+        UID2Manager.getInstance().onInitialized = callback::onSuccess
     }
 
     /**