diff --git a/build.gradle.kts b/build.gradle.kts
index 1c8da1d..6c4d707 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ allprojects {
     }
 
     group = "org.onflow.flow"
-    val defaultVersion = "0.0.22"
+    val defaultVersion = "0.0.23"
     version = System.getenv("GITHUB_REF")?.split('/')?.last() ?: defaultVersion
 }
 
diff --git a/flow/build.gradle.kts b/flow/build.gradle.kts
index 99825b1..9e55a1c 100644
--- a/flow/build.gradle.kts
+++ b/flow/build.gradle.kts
@@ -142,4 +142,3 @@ tasks.withType<KotlinNativeTest>().configureEach {
 tasks.named("build") { finalizedBy("createXCFramework") }
 tasks.named("clean") { doFirst { delete("swiftpackage") } }
 
-
diff --git a/flow/src/commonMain/kotlin/org/onflow/flow/websocket/FlowWebSocketClient.kt b/flow/src/commonMain/kotlin/org/onflow/flow/websocket/FlowWebSocketClient.kt
index 648a055..4f6f81c 100644
--- a/flow/src/commonMain/kotlin/org/onflow/flow/websocket/FlowWebSocketClient.kt
+++ b/flow/src/commonMain/kotlin/org/onflow/flow/websocket/FlowWebSocketClient.kt
@@ -230,7 +230,11 @@ class FlowWebSocketClient(
 
     private suspend fun sendMessage(message: FlowWebSocketMessage) {
         val session = webSocketSession ?: throw IllegalStateException("Not connected")
-        val text = json.encodeToString(FlowWebSocketMessage.serializer(), message)
+        val text = when (message) {
+            is FlowWebSocketRequest -> json.encodeToString(FlowWebSocketRequest.serializer(), message)
+            is FlowWebSocketResponse -> json.encodeToString(FlowWebSocketResponse.serializer(), message)
+            else -> throw IllegalArgumentException("Unknown message type: ${message::class}")
+        }
         session.send(Frame.Text(text))
     }
 
diff --git a/flow/src/commonTest/kotlin/org/onflow/flow/FlowTransactionTests.kt b/flow/src/commonTest/kotlin/org/onflow/flow/FlowTransactionTests.kt
index ac69d12..941d1ff 100644
--- a/flow/src/commonTest/kotlin/org/onflow/flow/FlowTransactionTests.kt
+++ b/flow/src/commonTest/kotlin/org/onflow/flow/FlowTransactionTests.kt
@@ -7,10 +7,8 @@ import org.onflow.flow.infrastructure.Cadence
 import org.onflow.flow.models.CadenceBase64Serializer
 import org.onflow.flow.models.TransactionBuilder
 import org.onflow.flow.models.TransactionStatus
-import org.onflow.flow.models.TransactionSignature
 import org.onflow.flow.models.createSigningRLP
 import org.onflow.flow.models.createSigningRLPJVMStyle
-import org.onflow.flow.models.envelopeMessage
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue