diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2d9de6f..ebaa4e8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,7 +11,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/adapter-okhttp3" />
             <option value="$PROJECT_DIR$/lib" />
             <option value="$PROJECT_DIR$/testapp" />
           </set>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..9a55c2d
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.22" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1b5460f..e66ddbb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -7,7 +6,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/adapter-okhttp3/.gitignore b/adapter-okhttp3/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/adapter-okhttp3/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/adapter-okhttp3/build.gradle b/adapter-okhttp3/build.gradle
deleted file mode 100644
index ec03ef2..0000000
--- a/adapter-okhttp3/build.gradle
+++ /dev/null
@@ -1,62 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'maven-publish'
-}
-
-android {
-    compileSdkVersion 31
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 31
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    namespace 'com.evdayapps.madassistant.adapters.okhttp3'
-}
-
-dependencies {
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-
-    implementation("com.squareup.okhttp3:okhttp:3.14.9")
-
-    implementation project(path: ':lib')
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            // Creates a Maven publication called "release".
-            release(MavenPublication) {
-                // Applies the component for the release build variant.
-                from components.release
-
-                // You can then customize attributes of the publication as shown below.
-                groupId = 'com.github.Evdayapps'
-                artifactId = 'adapter-okhttp3'
-                version = rootProject.ext.versionName
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/adapter-okhttp3/consumer-rules.pro b/adapter-okhttp3/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/adapter-okhttp3/proguard-rules.pro b/adapter-okhttp3/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/adapter-okhttp3/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/adapter-okhttp3/src/main/AndroidManifest.xml b/adapter-okhttp3/src/main/AndroidManifest.xml
deleted file mode 100644
index 44008a4..0000000
--- a/adapter-okhttp3/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest>
-
-</manifest>
\ No newline at end of file
diff --git a/adapter-okhttp3/src/main/java/com/evdayapps/madassistant/adapters/okhttp3/MADAssistantOkHttp3Interceptor.kt b/adapter-okhttp3/src/main/java/com/evdayapps/madassistant/adapters/okhttp3/MADAssistantOkHttp3Interceptor.kt
deleted file mode 100644
index e68d8ec..0000000
--- a/adapter-okhttp3/src/main/java/com/evdayapps/madassistant/adapters/okhttp3/MADAssistantOkHttp3Interceptor.kt
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.evdayapps.madassistant.adapters.okhttp3
-
-import com.evdayapps.madassistant.clientlib.MADAssistantClient
-import com.evdayapps.madassistant.clientlib.utils.Logger
-import com.evdayapps.madassistant.common.models.exceptions.ExceptionModel
-import com.evdayapps.madassistant.common.models.networkcalls.NetworkCallLogModel
-import okhttp3.*
-import okio.Buffer
-import okio.BufferedSource
-import okio.GzipSource
-import org.json.JSONArray
-import org.json.JSONObject
-import java.io.EOFException
-import java.nio.charset.Charset
-
-
-class MADAssistantOkHttp3Interceptor(
-    private val client: MADAssistantClient,
-    private val logger: Logger? = null
-) : Interceptor {
-
-    companion object {
-        private val UTF8 = Charset.forName("UTF-8")
-    }
-
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val request = chain.request()
-        val requestTimeMillis = System.currentTimeMillis()
-        try {
-            val response = chain.proceed(request)
-
-            logNetworkCall(
-                chain = chain,
-                request = request,
-                requestTimeMillis = requestTimeMillis,
-                response = response,
-                responseTimeMillis = System.currentTimeMillis()
-            )
-
-            return response
-        } catch (ex: Throwable) {
-            logNetworkCall(
-                chain = chain,
-                request = request,
-                requestTimeMillis = requestTimeMillis,
-                throwable = ex,
-                responseTimeMillis = System.currentTimeMillis()
-            )
-
-            throw ex
-        }
-    }
-
-    private fun logNetworkCall(
-        chain: Interceptor.Chain,
-        request: Request,
-        requestTimeMillis: Long,
-        response: Response? = null,
-        responseTimeMillis: Long,
-        throwable: Throwable? = null
-    ) {
-        try {
-            val data = NetworkCallLogModel()
-            data.threadName = Thread.currentThread().name
-
-            // Base
-            data.method = request.method()
-            data.url = request.url().toString()
-            data.protocol = chain.connection()?.protocol()?.name
-
-            // Timeouts
-            data.connectTimeoutMillis = chain.connectTimeoutMillis()
-            data.readTimeoutMillis = chain.readTimeoutMillis()
-            data.writeTimeoutMillis = chain.writeTimeoutMillis()
-
-            // Request
-            data.requestTimestamp = requestTimeMillis
-            data.requestHeaders = request.headers().toJSONArray()
-            request.body()?.let { body ->
-                if (request.header("Content-Type") == null && body.contentType() != null) {
-                    data.requestHeaders
-                        ?.put(
-                            JSONObject().apply {
-                                put("Content-Type", body.contentType())
-                            }
-                        )
-                }
-                if (request.header("Content-Length") == null) {
-                    data.requestHeaders
-                        ?.put(
-                            JSONObject().apply {
-                                put("Content-Length", body.contentLength())
-                            }
-                        )
-                }
-
-                data.requestBody = getRequestBody(request.headers(), body)
-            }
-
-            // Response
-            data.responseStatusCode = -1
-            data.responseTimestamp = responseTimeMillis
-            response?.let {
-                data.responseHeaders = it.headers().toJSONArray()
-                data.responseStatusCode = it.code()
-                fillResponseBody(response, data)
-            }
-
-            // Exception
-            throwable?.let {
-                data.exception = ExceptionModel(
-                    threadName = Thread.currentThread().name,
-                    throwable = it,
-                    isCrash = false
-                )
-            }
-
-            client.logNetworkCall(data)
-        } catch (ex: Throwable) {
-            logger?.e(ex)
-        }
-    }
-
-    private fun getRequestBody(headers: Headers, body: RequestBody): String {
-        return when {
-            bodyHasUnknownEncoding(headers) -> "(encoded body omitted)"
-            body.isDuplex -> "(duplex request body omitted)"
-            body.isOneShot -> "(one-shot body omitted)"
-            else -> {
-                val buffer = Buffer()
-                body.writeTo(buffer)
-
-                val charset: Charset = body.contentType()?.charset(UTF8) ?: UTF8
-                when {
-                    isPlaintext(buffer) -> buffer.readString(charset)
-                    else -> "(byte body omitted)"
-                }
-            }
-        }
-    }
-
-    private fun fillResponseBody(response: Response, data: NetworkCallLogModel) {
-        data.responseBody = when {
-            bodyHasUnknownEncoding(response.headers()) -> "(encoded body omitted)"
-            else -> {
-                when (val responseBody = response.body()) {
-                    null -> "(no response body)"
-                    else -> {
-                        val source: BufferedSource = responseBody.source()
-                        source.request(Long.MAX_VALUE)
-                        var buffer: Buffer = source.buffer
-                        data.responseLength = buffer.size()
-
-                        if ("gzip".equals(
-                                response.headers().get("Content-Encoding"),
-                                ignoreCase = true
-                            )
-                        ) {
-                            data.gzippedLength = buffer.size()
-                            GzipSource(buffer.clone()).use { gzippedResponseBody ->
-                                buffer = Buffer()
-                                buffer.writeAll(gzippedResponseBody)
-                                data.responseLength = buffer.size()
-                            }
-                        }
-
-                        val charset = responseBody.contentType()?.charset(UTF8) ?: UTF8
-
-                        when {
-                            !isPlaintext(buffer) -> "(byte body omitted)"
-                            else -> buffer.clone().readString(charset)
-                        }
-                    }
-                }
-            }
-
-        }
-    }
-
-    /**
-     * Returns true if the body in question probably contains human readable text. Uses a small sample
-     * of code points to detect unicode control characters commonly used in binary file signatures.
-     */
-    private fun isPlaintext(buffer: Buffer): Boolean {
-        return try {
-            val prefix = Buffer()
-            val byteCount = if (buffer.size() < 64) buffer.size() else 64
-            buffer.copyTo(prefix, 0, byteCount)
-            for (i in 0..15) {
-                if (prefix.exhausted()) {
-                    break
-                }
-                val codePoint = prefix.readUtf8CodePoint()
-                if (Character.isISOControl(codePoint) && !Character.isWhitespace(codePoint)) {
-                    return false
-                }
-            }
-            true
-        } catch (e: EOFException) {
-            false // Truncated UTF-8 sequence.
-        }
-    }
-
-    private fun bodyHasUnknownEncoding(headers: Headers): Boolean {
-        val contentEncoding = headers["Content-Encoding"]
-        return when {
-            contentEncoding == null -> false
-            contentEncoding.equals("identity", ignoreCase = true) -> false
-            contentEncoding.equals("gzip", ignoreCase = true) -> false
-            else -> true
-        }
-    }
-
-    private fun Headers.toJSONArray(): JSONArray {
-        val headers = this
-        return JSONArray().apply {
-            for (name in headers.names()) {
-                headers.values(name).forEach { value ->
-                    put(JSONObject().apply { put(name, value) })
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/adapter-okhttp3/src/test/java/com/evdayapps/madassistant/adapters/okhttp3/ExampleUnitTest.kt b/adapter-okhttp3/src/test/java/com/evdayapps/madassistant/adapters/okhttp3/ExampleUnitTest.kt
deleted file mode 100644
index 1417be4..0000000
--- a/adapter-okhttp3/src/test/java/com/evdayapps/madassistant/adapters/okhttp3/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.evdayapps.madassistant.adapters.okhttp3
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1bceef3..f733379 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kotlin_version = '1.8.0'
-        versionName = '0.0.27'
+        kotlin_version = '1.8.22'
+        versionName = '0.0.28'
     }
 
     repositories {
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 1e6465c..20ae4f5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,3 +20,6 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 org.gradle.unsafe.configuration-cache=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c331b97..82dc247 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
index 03725ce..d3e1874 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,9 +1,8 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
 
     defaultConfig {
         minSdkVersion 21
@@ -22,34 +21,25 @@ android {
 
     namespace 'com.evdayapps.madassistant.clientlib'
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
+
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "androidx.annotation:annotation:1.5.0"
+    implementation "androidx.annotation:annotation:1.7.0"
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation "io.mockk:mockk-android:1.12.0"
 
-    api 'com.github.Evdayapps:madassistant-common:0.0.15'
-    //api project(path: ':madassistant-common')
-}
-
-afterEvaluate {
-    publishing {
-        publications {
-            // Creates a Maven publication called "release".
-            release(MavenPublication) {
-                // Applies the component for the release build variant.
-                from components.release
-
-                // You can then customize attributes of the publication as shown below.
-                groupId = 'com.github.Evdayapps'
-                artifactId = 'lib'
-                version = rootProject.ext.versionName
-            }
-        }
-    }
+    api 'com.github.Evdayapps:madassistant-common:0.0.16'
 }
\ No newline at end of file
diff --git a/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClient.kt b/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClient.kt
index 63cdef5..d8ff6f7 100644
--- a/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClient.kt
+++ b/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClient.kt
@@ -2,6 +2,7 @@ package com.evdayapps.madassistant.clientlib
 
 import com.evdayapps.madassistant.clientlib.connection.ConnectionManager
 import com.evdayapps.madassistant.clientlib.transmission.Transmitter
+import com.evdayapps.madassistant.clientlib.utils.Logger
 import com.evdayapps.madassistant.common.models.networkcalls.NetworkCallLogModel
 
 /**
@@ -15,7 +16,7 @@ import com.evdayapps.madassistant.common.models.networkcalls.NetworkCallLogModel
  */
 interface MADAssistantClient {
 
-    interface Callback : Transmitter.Callback, ConnectionManager.Callback
+    interface Callback : Transmitter.Callback, ConnectionManager.Callback, Logger
 
     // region Connection
     /**
@@ -28,8 +29,7 @@ interface MADAssistantClient {
      * Disconnect from the service
      *
      * The default implementation in [MADAssistantClientImpl] passes the call to a
-     * [com.evdayapps.madassistant.clientlib.transmission.TransmissionManager] instance that
-     * transmits all logs in the queue and then disconnects from the service
+     * [Transmitter] instance that transmits all logs in the queue and then disconnects from the service
      */
     fun disconnect()
 
diff --git a/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClientImpl.kt b/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClientImpl.kt
index 9407bbe..5eafb9e 100644
--- a/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClientImpl.kt
+++ b/lib/src/main/java/com/evdayapps/madassistant/clientlib/MADAssistantClientImpl.kt
@@ -7,7 +7,6 @@ import com.evdayapps.madassistant.clientlib.permission.PermissionManager
 import com.evdayapps.madassistant.clientlib.permission.PermissionManagerImpl
 import com.evdayapps.madassistant.clientlib.transmission.Transmitter
 import com.evdayapps.madassistant.clientlib.transmission.TransmitterImpl
-import com.evdayapps.madassistant.clientlib.utils.Logger
 import com.evdayapps.madassistant.common.cipher.MADAssistantCipher
 import com.evdayapps.madassistant.common.cipher.MADAssistantCipherImpl
 import com.evdayapps.madassistant.common.models.networkcalls.NetworkCallLogModel
@@ -16,8 +15,6 @@ import com.evdayapps.madassistant.common.models.networkcalls.NetworkCallLogModel
  * An implementation of [MADAssistantClient]
  * @property applicationContext The application context
  * @property passphrase The encryption passphrase for the client
- * @property logger Instance of [Logger]
- * @property ignoreDeviceIdCheck Should this instance allow logging even if device id check fails?
  * This is utilised to generate a single auth-token for multiple users.
  * NOT RECOMMENDED!
  *
@@ -39,29 +36,25 @@ class MADAssistantClientImpl(
     private val applicationContext: Context,
     private val passphrase: String,
     private val repositorySignature: String = DEFAULT_SIGNATURE,
-    private val ignoreDeviceIdCheck: Boolean = false,
-    // Logs
-    private val logger: Logger? = null,
+    private val callback: MADAssistantClient.Callback,
     // Components
     private val cipher: MADAssistantCipher = MADAssistantCipherImpl(passPhrase = passphrase),
     private val permissionManager: PermissionManager = PermissionManagerImpl(
         cipher = cipher,
-        logger = logger,
-        ignoreDeviceIdCheck = ignoreDeviceIdCheck
+        logger = callback,
     ),
     private val connectionManager: ConnectionManager = ConnectionManagerImpl(
         applicationContext = applicationContext,
         repositorySignature = repositorySignature,
         permissionManager = permissionManager,
-        logger = logger,
+        logger = callback,
     ),
     private val transmitter: Transmitter = TransmitterImpl(
         cipher = cipher,
         permissionManager = permissionManager,
         connectionManager = connectionManager,
-        logger = logger
+        logger = callback
     ),
-    private val callback: MADAssistantClient.Callback
 ) : MADAssistantClient, ConnectionManager.Callback, Transmitter.Callback {
 
     companion object {
diff --git a/lib/src/main/java/com/evdayapps/madassistant/clientlib/permission/PermissionManagerImpl.kt b/lib/src/main/java/com/evdayapps/madassistant/clientlib/permission/PermissionManagerImpl.kt
index df6fab5..34b4d2e 100644
--- a/lib/src/main/java/com/evdayapps/madassistant/clientlib/permission/PermissionManagerImpl.kt
+++ b/lib/src/main/java/com/evdayapps/madassistant/clientlib/permission/PermissionManagerImpl.kt
@@ -14,7 +14,6 @@ import java.util.regex.Pattern
 class PermissionManagerImpl(
     private val cipher: MADAssistantCipher,
     private val logger: Logger? = null,
-    private val ignoreDeviceIdCheck: Boolean = false
 ) : PermissionManager {
 
     private val TAG = "PermissionManagerImpl"
@@ -44,7 +43,7 @@ class PermissionManagerImpl(
             else -> try {
                 // Decrypt the input string and parse it into a JSON object.
                 val deciphered = cipher.decrypt(string)
-                val json = JSONObject(deciphered)
+                val json = JSONObject(deciphered!!)
                 val permissions = MADAssistantPermissions(json)
 
                 // Store the permissions object in a class property.
@@ -76,13 +75,9 @@ class PermissionManagerImpl(
 
     /**
      * Checks if the id of the current device is in the whitelist
-     * @return true if [ignoreDeviceIdCheck] or device id is in the whitelist
+     * @return true if device id is in the whitelist
      */
     private fun isWhitelistedDevice(deviceId: String): Boolean {
-        if (ignoreDeviceIdCheck) {
-            return true
-        }
-
         // Check if the device id is in the whitelist
         // Returns false if no permissions/deviceIds specified
         return permissions?.deviceId?.split(",")?.contains(deviceId) ?: false
@@ -142,8 +137,9 @@ class PermissionManagerImpl(
             return false
         }
 
-        val chkMethod = patternNetworkCallMethod?.matches(networkCallLogModel.method) ?: true
-        val chkUrl = patternNetworkCallUrl?.matches(networkCallLogModel.url) ?: true
+        val chkMethod =
+            patternNetworkCallMethod?.matches(networkCallLogModel.request?.method) ?: true
+        val chkUrl = patternNetworkCallUrl?.matches(networkCallLogModel.request?.url) ?: true
 
         return chkMethod && chkUrl
     }
@@ -156,7 +152,7 @@ class PermissionManagerImpl(
     }
 
     /**
-     * Test if [exception] should be logged to the repository
+     * Test if [throwable] should be logged to the repository
      */
     override fun shouldLogExceptions(throwable: Throwable): Boolean {
         if (!isLoggingEnabled() || (permissions?.exceptions?.enabled != true)) {
diff --git a/lib/src/main/java/com/evdayapps/madassistant/clientlib/transmission/TransmitterImpl.kt b/lib/src/main/java/com/evdayapps/madassistant/clientlib/transmission/TransmitterImpl.kt
index 96ea942..a414c27 100644
--- a/lib/src/main/java/com/evdayapps/madassistant/clientlib/transmission/TransmitterImpl.kt
+++ b/lib/src/main/java/com/evdayapps/madassistant/clientlib/transmission/TransmitterImpl.kt
@@ -15,7 +15,7 @@ import com.evdayapps.madassistant.common.models.networkcalls.NetworkCallLogModel
 import com.evdayapps.madassistant.common.models.transmission.TransmissionModel
 import org.json.JSONArray
 import org.json.JSONObject
-import java.util.*
+import java.util.UUID
 
 /**
  * Responsibilities:
@@ -243,7 +243,7 @@ class TransmitterImpl(
         if (sessionId != -1L) {
             queueManager.addMessageToQueue(
                 type = MADAssistantTransmissionType.NetworkCall,
-                timestamp = data.requestTimestamp,
+                timestamp = data.request!!.timestamp,
                 sessionId = sessionId,
                 first = data
             )
@@ -277,10 +277,10 @@ class TransmitterImpl(
             val payload = data.first as NetworkCallLogModel
             if (permissionManager.shouldLogNetworkCall(payload)) {
                 // Redact headers as required
-                payload.requestHeaders = trimRedactedHeaders(payload.requestHeaders)
-                payload.responseHeaders = trimRedactedHeaders(payload.responseHeaders)
+                payload.request?.headers = trimRedactedHeaders(payload.request?.headers)
+                payload.response?.headers = trimRedactedHeaders(payload.response?.headers)
 
-                val json = payload.toJsonObject().toString(0)
+                val json = payload.toJson().toString(0)
 
                 transmit(
                     json = json,
diff --git a/settings.gradle b/settings.gradle
index 0c40fc2..0858b54 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,5 @@
-rootProject.name='madassistant-client'
+rootProject.name = 'madassistant-client'
 
 include ':lib'
-include ':adapter-okhttp3'
 include ':testapp'
 
-//project(':madassistant-common').projectDir = file("../madassistant-common/madassistant-common")
\ No newline at end of file
diff --git a/testapp/build.gradle b/testapp/build.gradle
index 06237ba..06b476a 100644
--- a/testapp/build.gradle
+++ b/testapp/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    compileSdk 33
     defaultConfig {
         applicationId "com.evdayapps.madassistant.testapp"
         minSdkVersion 21
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility 17
+        targetCompatibility 17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = 17
     }
     namespace 'com.evdayapps.madassistant.testapp'
 
@@ -42,13 +42,13 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.1"
+        kotlinCompilerExtensionVersion = "1.4.8"
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib"
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     testImplementation 'junit:junit:4.13.2'
@@ -86,6 +86,6 @@ dependencies {
 
     //region MADAssistant
     implementation project(path: ':lib')
-    implementation project(path: ':adapter-okhttp3')
+//    implementation project(path: ':adapter-okhttp3')
     //endregion MADAssistant
 }
diff --git a/testapp/src/main/java/com/evdayapps/madassistant/testapp/TestActivity.kt b/testapp/src/main/java/com/evdayapps/madassistant/testapp/TestActivity.kt
index be90787..4449cc5 100644
--- a/testapp/src/main/java/com/evdayapps/madassistant/testapp/TestActivity.kt
+++ b/testapp/src/main/java/com/evdayapps/madassistant/testapp/TestActivity.kt
@@ -11,7 +11,6 @@ import androidx.compose.runtime.mutableStateOf
 import com.evdayapps.madassistant.clientlib.MADAssistantClient
 import com.evdayapps.madassistant.clientlib.MADAssistantClientImpl
 import com.evdayapps.madassistant.clientlib.connection.ConnectionManager
-import com.evdayapps.madassistant.clientlib.utils.Logger
 import com.evdayapps.madassistant.testapp.screens.main.MainScreenViewModel
 
 class TestActivity : AppCompatActivity() {
@@ -49,40 +48,9 @@ class TestActivity : AppCompatActivity() {
     }
 
     private fun initMADAssistant() {
-        val logUtils = object : Logger {
-            override fun i(tag: String, message: String) {
-                logs.value = logs.value.plus(Triple("INFO", tag, message))
-            }
-
-            override fun v(tag: String, message: String) {
-                logs.value = logs.value.plus(Triple("VERBOSE", tag, message))
-            }
-
-            override fun d(tag: String, message: String) {
-                logs.value = logs.value.plus(Triple("DEBUG", tag, message))
-            }
-
-            override fun w(tag: String, message: String) {
-                logs.value = logs.value.plus(Triple("WARN", tag, message))
-            }
-
-            override fun e(throwable: Throwable) {
-                logs.value = logs.value.plus(
-                    Triple(
-                        "ERROR",
-                        throwable::class.java.simpleName,
-                        throwable.message ?: ""
-                    )
-                )
-                throwable.printStackTrace()
-            }
-        }
-
         madAssistantClient = MADAssistantClientImpl(
             applicationContext = applicationContext,
-            repositorySignature = "",
             passphrase = "test",
-            logger = logUtils,
             callback = object : MADAssistantClient.Callback {
                 override fun onSessionStarted(sessionId: Long) {
                     sessionActive.value = true
@@ -106,6 +74,33 @@ class TestActivity : AppCompatActivity() {
                     )
                 }
 
+                override fun i(tag: String, message: String) {
+                    logs.value = logs.value.plus(Triple("INFO", tag, message))
+                }
+
+                override fun v(tag: String, message: String) {
+                    logs.value = logs.value.plus(Triple("VERBOSE", tag, message))
+                }
+
+                override fun d(tag: String, message: String) {
+                    logs.value = logs.value.plus(Triple("DEBUG", tag, message))
+                }
+
+                override fun w(tag: String, message: String) {
+                    logs.value = logs.value.plus(Triple("WARN", tag, message))
+                }
+
+                override fun e(throwable: Throwable) {
+                    logs.value = logs.value.plus(
+                        Triple(
+                            "ERROR",
+                            throwable::class.java.simpleName,
+                            throwable.message ?: ""
+                        )
+                    )
+                    throwable.printStackTrace()
+                }
+
             }
         )
 
diff --git a/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/MainScreenViewModel.kt b/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/MainScreenViewModel.kt
index aeb2e70..9b4771f 100644
--- a/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/MainScreenViewModel.kt
+++ b/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/MainScreenViewModel.kt
@@ -4,13 +4,7 @@ import android.util.Log
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.evdayapps.madassistant.adapters.okhttp3.MADAssistantOkHttp3Interceptor
 import com.evdayapps.madassistant.clientlib.MADAssistantClient
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import okhttp3.OkHttpClient
-import okhttp3.Request
 
 @Suppress("KotlinConstantConditions")
 class MainScreenViewModel(
@@ -86,25 +80,25 @@ class MainScreenViewModel(
     )
 
     fun testApiCall() {
-        viewModelScope.launch(Dispatchers.IO) {
-            try {
-                val client = OkHttpClient.Builder()
-                    .addInterceptor(
-                        MADAssistantOkHttp3Interceptor(client = madAssistantClient)
-                    )
-                    .build()
-
-                // Make the call
-                val bldr = Request.Builder().url(networkCallConfig.value.url)
-                networkCallConfig.value.headers.forEach {
-                    bldr.addHeader(it.key, it.value as String)
-                }
-
-                client.newCall(bldr.build()).execute()
-            } catch (ex: Exception) {
-                madAssistantClient.logException(ex)
-            }
-        }
+//        viewModelScope.launch(Dispatchers.IO) {
+//            try {
+//                val client = OkHttpClient.Builder()
+//                    .addInterceptor(
+//                        MADAssistantOkHttp3Interceptor(client = madAssistantClient)
+//                    )
+//                    .build()
+//
+//                // Make the call
+//                val bldr = Request.Builder().url(networkCallConfig.value.url)
+//                networkCallConfig.value.headers.forEach {
+//                    bldr.addHeader(it.key, it.value as String)
+//                }
+//
+//                client.newCall(bldr.build()).execute()
+//            } catch (ex: Exception) {
+//                madAssistantClient.logException(ex)
+//            }
+//        }
     }
 
 
diff --git a/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/widgets/AbsSectionCardWidget.kt b/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/widgets/AbsSectionCardWidget.kt
index 59ea7ae..1536d43 100644
--- a/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/widgets/AbsSectionCardWidget.kt
+++ b/testapp/src/main/java/com/evdayapps/madassistant/testapp/screens/main/widgets/AbsSectionCardWidget.kt
@@ -3,8 +3,19 @@ package com.evdayapps.madassistant.testapp.screens.main.widgets
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.material.*
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.Button
+import androidx.compose.material.Card
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDropDown
 import androidx.compose.material.icons.filled.CheckCircle
@@ -68,7 +79,7 @@ private fun SectionCardWidgetTest() {
         paramsTitle = "Headers",
         paramsAddBtnLabel = "Add Header",
         paramsList = { it.headers },
-        updateParams = { config, params -> config },
+        updateParams = { config, _ -> config },
         onUpdateConfig = {},
         onRequestButtonClicked = {}
     )