diff --git a/docs/guides/build-wallet.md b/docs/guides/build-wallet.md
index 9c06d4eba6..e8dfce1f43 100644
--- a/docs/guides/build-wallet.md
+++ b/docs/guides/build-wallet.md
@@ -18,8 +18,7 @@ First you need to create a bridge between your extension and the page. This can
 ```js
 import browser from 'webextension-polyfill'
 import {
-  BrowserRuntimeConnection, BrowserWindowMessageConnection, MESSAGE_DIRECTION,
-  ContentScriptBridge
+  BrowserRuntimeConnection, BrowserWindowMessageConnection, MESSAGE_DIRECTION, connectionProxy
 } from '@aeternity/aepp-sdk'
 
 const readyStateCheckInterval = setInterval(function () {
@@ -27,15 +26,14 @@ const readyStateCheckInterval = setInterval(function () {
     clearInterval(readyStateCheckInterval)
 
     const port = browser.runtime.connect()
-    const extConnection = BrowserRuntimeConnection({ port })
-    const pageConnection = BrowserWindowMessageConnection({
+    const extConnection = new BrowserRuntimeConnection({ port })
+    const pageConnection = new BrowserWindowMessageConnection({
+      target: window,
       origin: window.origin,
       sendDirection: MESSAGE_DIRECTION.to_aepp,
       receiveDirection: MESSAGE_DIRECTION.to_waellet
     })
-
-    const bridge = ContentScriptBridge({ pageConnection, extConnection })
-    bridge.run()
+    connectionProxy(pageConnection, extConnection)
   }
 }, 10)
 ```
@@ -106,7 +104,7 @@ async function init () {
   }).then(wallet => {
     chrome.runtime.onConnect.addListener(async function (port) {
       // create connection
-      const connection = await BrowserRuntimeConnection({ port })
+      const connection = new BrowserRuntimeConnection({ port })
       // add new aepp to wallet
       wallet.addRpcClient(connection)
       // share wallet details
@@ -190,7 +188,7 @@ async function init () {
   }).then(wallet => {
     chrome.runtime.onConnect.addListener(async function (port) {
       // create connection
-      const connection = await BrowserRuntimeConnection({ port })
+      const connection = new BrowserRuntimeConnection({ port })
       // add new aepp to wallet
       wallet.addRpcClient(connection)
       // share wallet details
@@ -206,7 +204,7 @@ init().then(_ => console.log('Wallet initialized!'))
 ```
 
 ## iFrame-based Wallet
-The **iFrame-based** approach works similar to the **WebExtension** approach except that the `ContentScriptBridge` in between isn't needed.
+The **iFrame-based** approach works similar to the **WebExtension** approach except that the `connectionProxy` in between isn't needed.
 
 You can take a look into the implementation of the following example to see how it works:
 
diff --git a/docs/guides/connect-aepp-to-wallet.md b/docs/guides/connect-aepp-to-wallet.md
index 8d3da3fb97..e6190dfb8a 100644
--- a/docs/guides/connect-aepp-to-wallet.md
+++ b/docs/guides/connect-aepp-to-wallet.md
@@ -10,7 +10,7 @@ You can build your own wallet in the next example
 ## 1. Specify imports and constants and state
 
 ```js
-import { RpcAepp, WalletDetector, BrowserWindowMessageConnection, Node } from '@aeternity/aepp-sdk'
+import { RpcAepp, walletDetector, BrowserWindowMessageConnection, Node } from '@aeternity/aepp-sdk'
 
 const TESTNET_NODE_URL = 'https://testnet.aeternity.io'
 const MAINNET_NODE_URL = 'https://mainnet.aeternity.io'
@@ -62,16 +62,13 @@ methods: {
     const handleWallets = async function ({ wallets, newWallet }) {
       newWallet = newWallet || Object.values(wallets)[0]
       if (confirm(`Do you want to connect to wallet ${newWallet.name}`)) {
-        detector.stopScan()
+        stopScan()
         // connect to the wallet, see step 4.
         await this.connect(newWallet)
       }
     }
-
-    const scannerConnection = BrowserWindowMessageConnection()
-
-    const detector = await WalletDetector({ connection: scannerConnection })
-    detector.scan(handleWallets.bind(this))
+    const scannerConnection = new BrowserWindowMessageConnection()
+    const stopScan = walletDetector(scannerConnection, handleWallets.bind(this))
   }
 }
 ```
diff --git a/docs/guides/error-handling.md b/docs/guides/error-handling.md
index 5ff39706a5..57c17cb464 100644
--- a/docs/guides/error-handling.md
+++ b/docs/guides/error-handling.md
@@ -98,7 +98,6 @@ BaseError
 │
 └̌───WalletError
 │   │   AlreadyConnectedError
-│   │   MessageDirectionError
 │   │   NoWalletConnectedError
 │   │   RpcConnectionError
 ```
diff --git a/examples/browser/aepp/src/Connect.vue b/examples/browser/aepp/src/Connect.vue
index 8c8f519ebf..9b9f027b8c 100644
--- a/examples/browser/aepp/src/Connect.vue
+++ b/examples/browser/aepp/src/Connect.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import { WalletDetector, BrowserWindowMessageConnection } from '@aeternity/aepp-sdk'
+import { walletDetector, BrowserWindowMessageConnection } from '@aeternity/aepp-sdk'
 import Value from './Value'
 import { mapGetters } from 'vuex'
 
@@ -67,7 +67,7 @@ export default {
         newWallet = newWallet || Object.values(wallets)[0]
         if (confirm(`Do you want to connect to wallet ${newWallet.name} with id ${newWallet.id}`)) {
           console.log('newWallet', newWallet)
-          detector.stopScan()
+          stopScan()
 
           await this.aeSdk.connectToWallet(await newWallet.getConnection())
           this.walletConnected = true
@@ -76,9 +76,8 @@ export default {
         }
       }
 
-      const scannerConnection = await BrowserWindowMessageConnection()
-      const detector = await WalletDetector({ connection: scannerConnection })
-      detector.scan(handleWallets.bind(this))
+      const scannerConnection = new BrowserWindowMessageConnection()
+      const stopScan = walletDetector(scannerConnection, handleWallets.bind(this))
     },
     async connect () {
       if (this.connectMethod === 'reverse-iframe') {
diff --git a/examples/browser/wallet-iframe/src/App.vue b/examples/browser/wallet-iframe/src/App.vue
index d1f911a9db..baa1938e50 100644
--- a/examples/browser/wallet-iframe/src/App.vue
+++ b/examples/browser/wallet-iframe/src/App.vue
@@ -106,7 +106,7 @@ export default {
     this.address = this.aeSdk.addresses()[0]
 
     const target = this.runningInFrame ? window.parent : this.$refs.aepp.contentWindow
-    const connection = BrowserWindowMessageConnection({ target })
+    const connection = new BrowserWindowMessageConnection({ target })
     this.aeSdk.addRpcClient(connection)
     this.shareWalletInfo(connection.sendMessage.bind(connection))
 
diff --git a/examples/browser/wallet-web-extension/src/background.js b/examples/browser/wallet-web-extension/src/background.js
index 3605ab90d3..8eb43cf8fa 100644
--- a/examples/browser/wallet-web-extension/src/background.js
+++ b/examples/browser/wallet-web-extension/src/background.js
@@ -67,7 +67,7 @@ import {
 
   browser.runtime.onConnect.addListener((port) => {
     // create connection
-    const connection = BrowserRuntimeConnection({ port })
+    const connection = new BrowserRuntimeConnection({ port })
     // add new aepp to wallet
     aeSdk.addRpcClient(connection)
     // share wallet details
diff --git a/examples/browser/wallet-web-extension/src/content-script.js b/examples/browser/wallet-web-extension/src/content-script.js
index ae22754d8b..6da02a70c1 100644
--- a/examples/browser/wallet-web-extension/src/content-script.js
+++ b/examples/browser/wallet-web-extension/src/content-script.js
@@ -1,7 +1,7 @@
 /* global browser */
 
 import {
-  BrowserRuntimeConnection, BrowserWindowMessageConnection, MESSAGE_DIRECTION, ContentScriptBridge
+  BrowserRuntimeConnection, BrowserWindowMessageConnection, MESSAGE_DIRECTION, connectionProxy
 } from '@aeternity/aepp-sdk'
 
 (async () => {
@@ -17,13 +17,12 @@ import {
   console.log('Document is ready')
 
   const port = browser.runtime.connect()
-  const extConnection = BrowserRuntimeConnection({ port })
-  const pageConnection = BrowserWindowMessageConnection({
+  const extConnection = new BrowserRuntimeConnection({ port })
+  const pageConnection = new BrowserWindowMessageConnection({
+    target: window,
     origin: window.origin,
     sendDirection: MESSAGE_DIRECTION.to_aepp,
     receiveDirection: MESSAGE_DIRECTION.to_waellet
   })
-
-  const bridge = ContentScriptBridge({ pageConnection, extConnection })
-  bridge.run()
+  connectionProxy(pageConnection, extConnection)
 })()
diff --git a/src/index.js b/src/index.js
index baf2969ee6..90e3ff43f6 100644
--- a/src/index.js
+++ b/src/index.js
@@ -44,9 +44,9 @@ export { default as Oracle } from './ae/oracle'
 export { default as Channel } from './channel'
 export { default as Universal } from './ae/universal'
 
-export { default as ContentScriptBridge } from './utils/aepp-wallet-communication/content-script-bridge'
+export { default as connectionProxy } from './utils/aepp-wallet-communication/connection-proxy'
 export * from './utils/aepp-wallet-communication/schema'
-export { default as WalletDetector } from './utils/aepp-wallet-communication/wallet-detector'
-export { default as BrowserRuntimeConnection } from './utils/aepp-wallet-communication/connection/browser-runtime'
-export { default as BrowserWindowMessageConnection } from './utils/aepp-wallet-communication/connection/browser-window-message'
+export { default as walletDetector } from './utils/aepp-wallet-communication/wallet-detector'
+export { default as BrowserRuntimeConnection } from './utils/aepp-wallet-communication/connection/BrowserRuntime'
+export { default as BrowserWindowMessageConnection } from './utils/aepp-wallet-communication/connection/BrowserWindowMessage'
 export * from './utils/errors'
diff --git a/src/utils/aepp-wallet-communication/connection-proxy.ts b/src/utils/aepp-wallet-communication/connection-proxy.ts
new file mode 100644
index 0000000000..bdf76b50cb
--- /dev/null
+++ b/src/utils/aepp-wallet-communication/connection-proxy.ts
@@ -0,0 +1,35 @@
+/*
+ * ISC License (ISC)
+ * Copyright (c) 2022 aeternity developers
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ *  PERFORMANCE OF THIS SOFTWARE.
+ */
+
+import BrowserConnection from './connection/Browser'
+
+/**
+ * Browser connection proxy
+ * Provide functionality to easily forward messages from one connection to another and back
+ * @param con1 first connection
+ * @param con2 second connection
+ * @returns a function to stop proxying
+ */
+export default (con1: BrowserConnection, con2: BrowserConnection): () => void => {
+  con1.connect((msg: any) => con2.sendMessage(msg), () => con2.disconnect())
+  con2.connect((msg: any) => con1.sendMessage(msg), () => con1.disconnect())
+
+  return () => {
+    con1.disconnect()
+    con2.disconnect()
+  }
+}
diff --git a/src/utils/aepp-wallet-communication/connection/Browser.ts b/src/utils/aepp-wallet-communication/connection/Browser.ts
new file mode 100644
index 0000000000..f13034a913
--- /dev/null
+++ b/src/utils/aepp-wallet-communication/connection/Browser.ts
@@ -0,0 +1,68 @@
+/*
+ * ISC License (ISC)
+ * Copyright (c) 2022 aeternity developers
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ *  PERFORMANCE OF THIS SOFTWARE.
+ */
+
+import { AlreadyConnectedError, NoWalletConnectedError } from '../../errors'
+
+/**
+ * Browser connection base interface
+ */
+export default abstract class BrowserConnection {
+  debug: boolean
+
+  protected constructor ({ debug = false }: { debug?: boolean }) {
+    this.debug = debug
+  }
+
+  /**
+   * Connect
+   * @param onMessage - Message handler
+   * @param onDisconnect - trigger when runtime connection in closed
+   */
+  connect (
+    onMessage: (message: any, origin: string, source: any) => void,
+    onDisconnect: () => void
+  ): void {
+    if (this.isConnected()) throw new AlreadyConnectedError('You already connected')
+  }
+
+  /**
+   * Disconnect
+   */
+  disconnect (): void {
+    if (!this.isConnected()) throw new NoWalletConnectedError('You dont have connection. Please connect before')
+  }
+
+  /**
+   * Send message
+   */
+  protected receiveMessage (message: any): void {
+    if (this.debug) console.log('Receive message:', message)
+  }
+
+  /**
+   * Send message
+   */
+  sendMessage (message: any): void {
+    if (this.debug) console.log('Send message:', message)
+  }
+
+  /**
+   * Check if connected
+   * @return Is connected
+   */
+  abstract isConnected (): boolean
+}
diff --git a/src/utils/aepp-wallet-communication/connection/BrowserRuntime.ts b/src/utils/aepp-wallet-communication/connection/BrowserRuntime.ts
new file mode 100644
index 0000000000..bb6bf68218
--- /dev/null
+++ b/src/utils/aepp-wallet-communication/connection/BrowserRuntime.ts
@@ -0,0 +1,58 @@
+/*
+ * ISC License (ISC)
+ * Copyright (c) 2022 aeternity developers
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ *  PERFORMANCE OF THIS SOFTWARE.
+ */
+
+import { Runtime } from 'webextension-polyfill'
+import BrowserConnection from './Browser'
+
+/**
+ * BrowserRuntimeConnection
+ * Handle browser runtime communication
+ */
+export default class BrowserRuntimeConnection extends BrowserConnection {
+  port: Runtime.Port
+
+  constructor ({ port, ...options }: { port: Runtime.Port, debug: boolean }) {
+    super(options)
+    this.port = port
+  }
+
+  disconnect (): void {
+    super.disconnect()
+    this.port.disconnect()
+  }
+
+  connect (
+    onMessage: (message: any, origin: string, source: Runtime.Port) => void,
+    onDisconnect: () => void
+  ): void {
+    super.connect(onMessage, onDisconnect)
+    this.port.onMessage.addListener((message, port) => {
+      this.receiveMessage(message)
+      onMessage(message, port.name, port)
+    })
+    this.port.onDisconnect.addListener(onDisconnect)
+  }
+
+  sendMessage (message: any): void {
+    super.sendMessage(message)
+    this.port.postMessage(message)
+  }
+
+  isConnected (): boolean {
+    return this.port.onMessage.hasListeners()
+  }
+}
diff --git a/src/utils/aepp-wallet-communication/connection/BrowserWindowMessage.ts b/src/utils/aepp-wallet-communication/connection/BrowserWindowMessage.ts
new file mode 100644
index 0000000000..a947123f85
--- /dev/null
+++ b/src/utils/aepp-wallet-communication/connection/BrowserWindowMessage.ts
@@ -0,0 +1,101 @@
+/*
+ * ISC License (ISC)
+ * Copyright (c) 2022 aeternity developers
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ *  PERFORMANCE OF THIS SOFTWARE.
+ */
+
+import BrowserConnection from './Browser'
+import { MESSAGE_DIRECTION } from '../schema'
+import { InternalError, RpcConnectionError } from '../../errors'
+
+/**
+ * Browser window Post Message connector module
+ * @param params - Initializer object
+ * @param params.target - Target window for message
+ * @param params.self - Host window for message
+ * @param params.origin - Origin of receiver
+ * @param params.sendDirection Wrapping messages into additional struct
+ * ({ type: 'to_aepp' || 'to_waellet', data })
+ * Used for handling messages between content script and page
+ * @param params.receiveDirection Unwrapping messages from additional struct
+ */
+export default class BrowserWindowMessageConnection extends BrowserConnection {
+  origin?: string
+  sendDirection?: MESSAGE_DIRECTION
+  receiveDirection: MESSAGE_DIRECTION
+  listener?: (this: Window, ev: MessageEvent<any>) => void
+  _target?: Window
+  _self: Window
+
+  constructor ({
+    target,
+    self = window,
+    origin,
+    sendDirection,
+    receiveDirection = MESSAGE_DIRECTION.to_aepp,
+    ...options
+  }: {
+    target?: Window
+    self?: Window
+    origin?: string
+    sendDirection?: MESSAGE_DIRECTION
+    receiveDirection?: MESSAGE_DIRECTION
+    debug?: boolean
+  } = {}) {
+    super(options)
+    this._target = target
+    this._self = self
+    this.origin = origin
+    this.sendDirection = sendDirection
+    this.receiveDirection = receiveDirection
+  }
+
+  isConnected (): boolean {
+    return this.listener != null
+  }
+
+  connect (
+    onMessage: (message: any, origin: string, source: MessageEventSource | null) => void,
+    onDisconnect: () => void
+  ): void {
+    super.connect(onMessage, onDisconnect)
+    this.listener = (message: MessageEvent<any>) => {
+      if (typeof message.data !== 'object') return
+      if (this.origin != null && this.origin !== message.origin) return
+      if (this._target != null && this._target !== message.source) return
+      this.receiveMessage(message)
+      let { data } = message
+      if (data.type != null) {
+        if (message.data.type !== this.receiveDirection) return
+        data = data.data
+      }
+      onMessage(data, message.origin, message.source)
+    }
+    this._self.addEventListener('message', this.listener)
+  }
+
+  disconnect (): void {
+    super.disconnect()
+    if (this.listener == null) throw new InternalError('Expected to not happen, required for TS')
+    this._self.removeEventListener('message', this.listener)
+    delete this.listener
+  }
+
+  sendMessage (msg: MessageEvent): void {
+    if (this._target == null) throw new RpcConnectionError('Can\'t send messages without target')
+    const message = this.sendDirection != null ? { type: this.sendDirection, data: msg } : msg
+    super.sendMessage(message)
+    this._target.postMessage(message, this.origin ?? '*')
+  }
+}
diff --git a/src/utils/aepp-wallet-communication/connection/browser-runtime.js b/src/utils/aepp-wallet-communication/connection/browser-runtime.js
deleted file mode 100644
index 353612e707..0000000000
--- a/src/utils/aepp-wallet-communication/connection/browser-runtime.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Browser runtime connector module
- *
- * This is the complement to
- * {@link module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection}.
- * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-runtime
- * @export BrowserRuntimeConnection
- * @example import { BrowserRuntimeConnection } from '@aeternity/aepp-sdk'
- */
-import stampit from '@stamp/it'
-import WalletConnection from '.'
-import { AlreadyConnectedError, NoWalletConnectedError } from '../../errors'
-
-/**
- * Disconnect
- * @function disconnect
- * @instance
- * @rtype () => void
- * @return {void}
- */
-function disconnect () {
-  try {
-    this.port.disconnect()
-  } catch (e) {
-    console.warning('From BrowserRuntimeConnection: ', e)
-  }
-}
-
-/**
- * Connect
- * @function connect
- * @instance
- * @rtype (onMessage: Function, onDisconnect: Function) => void
- * @param {Function} onMessage - Message handler
- * @param {Function} onDisconnect - trigger when runtime connection in closed
- * @return {void}
- */
-function connect (onMessage, onDisconnect) {
-  if (this.isConnected()) throw new AlreadyConnectedError('You already connected')
-  this.handler = (msg, source) => {
-    if (this.debug) console.log('Receive message: ', msg)
-    onMessage(msg, source)
-  }
-  this.port.onMessage.addListener(this.handler)
-  this.port.onDisconnect.addListener(() => {
-    typeof onDisconnect === 'function' && onDisconnect({}, this)
-    this.port.disconnect()
-  })
-}
-
-/**
- * Send message
- * @function sendMessage
- * @instance
- * @rtype (msg: Object) => void
- * @param {Object} msg - Message
- * @return {void}
- */
-function sendMessage (msg) {
-  if (!this.port) throw new NoWalletConnectedError('You dont have connection. Please connect before')
-  if (this.debug) console.log('Send message: ', msg)
-  this.port.postMessage(msg)
-}
-
-/**
- * Check if connected
- * @function isConnected
- * @instance
- * @rtype () => Boolean
- * @return {Boolean} Is connected
- */
-function isConnected () {
-  return typeof this.port.onMessage.hasListeners === 'function' ? this.port.onMessage.hasListeners() : this.port.onMessage.hasListener(this.handler)
-}
-
-/**
- * BrowserRuntimeConnection stamp
- * Handle browser runtime communication
- * @function
- * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-runtime
- * @rtype Stamp
- * @param {Object} params={} - Initializer object
- * @param {Object} params.port - Runtime `port` object
- * @param {Boolean} [params.debug=false] - Debug flag
- * @return {Object}
- */
-export default stampit({
-  init ({ port, debug = false }) {
-    this.debug = debug
-    this.port = port
-  },
-  methods: { connect, sendMessage, disconnect, isConnected }
-}, WalletConnection)
diff --git a/src/utils/aepp-wallet-communication/connection/browser-window-message.js b/src/utils/aepp-wallet-communication/connection/browser-window-message.js
deleted file mode 100644
index 360e77d04f..0000000000
--- a/src/utils/aepp-wallet-communication/connection/browser-window-message.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Browser window Post Message connector module
- *
- * This is the complement to
- * {@link module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection}.
- * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-window-message
- * @export BrowserWindowMessageConnection
- * @example
- * import BrowserWindowMessageConnection
- * from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-window-message'
- */
-import stampit from '@stamp/it'
-import WalletConnection from '.'
-import { MESSAGE_DIRECTION } from '../schema'
-import {
-  AlreadyConnectedError,
-  NoWalletConnectedError,
-  MessageDirectionError
-} from '../../errors'
-
-/**
- * Check if connected
- * @function isConnected
- * @instance
- * @rtype () => Boolean
- * @return {Boolean} Is connected
- */
-function isConnected () {
-  return this.listener
-}
-
-/**
- * Connect
- * @function connect
- * @instance
- * @rtype (onMessage: Function) => void
- * @param {Function} onMessage - Message handler
- * @return {void}
- */
-function connect (onMessage) {
-  const origin = this.origin
-  const receiveDirection = this.receiveDirection
-  const debug = this.debug
-  const forceOrigin = this.forceOrigin
-  if (this.listener) throw new AlreadyConnectedError('You already connected')
-
-  this.listener = (msg) => {
-    if (!msg || typeof msg.data !== 'object') return
-    if (!forceOrigin && origin && origin !== msg.origin) return
-    if (debug) console.log('Receive message: ', msg)
-    if (msg.data.type) {
-      if (msg.data.type !== receiveDirection) return
-      onMessage(msg.data.data, msg.origin, msg.source)
-    } else {
-      onMessage(msg.data, msg.origin, msg.source)
-    }
-  }
-  this.subscribeFn(this.listener)
-}
-
-/**
- * Disconnect
- * @function disconnect
- * @instance
- * @rtype () => void
- * @return {void}
- */
-function disconnect () {
-  if (!this.listener) throw new NoWalletConnectedError('You dont have connection. Please connect before')
-  this.unsubscribeFn(this.listener)
-  this.listener = null
-}
-
-/**
- * Send message
- * @function sendMessage
- * @instance
- * @rtype (msg: Object) => void
- * @param {Object} msg - Message
- * @return {void}
- */
-function sendMessage (msg) {
-  const message = this.sendDirection ? { type: this.sendDirection, data: msg } : msg
-  if (this.debug) console.log('Send message: ', message)
-  this.postFn(message)
-}
-
-const getTarget = () => {
-  const { chrome, browser } = window
-  const isExtensionContext = typeof chrome !== 'undefined' && chrome === Object(chrome) ||
-    typeof browser !== 'undefined' && browser === Object(browser)
-  const isWeb = window && window.location && window.location.protocol.startsWith('http')
-  const isContentScript = isExtensionContext && isWeb
-  if (isContentScript) return window
-  // When we is the main page we need to decide the target by our self
-  // Probably can be implemented some algo for checking DOM for Iframes and somehow decide which
-  // Iframe to talk
-  const isInIframe = window !== window.parent
-  return isInIframe ? window.parent : undefined
-}
-
-/**
- * BrowserWindowMessageConnection
- * @function
- * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication\
- * /connection/browser-window-message
- * @rtype Stamp
- * @param {Object} [params={}] - Initializer object
- * @param {Object} [params.target=window.parent] - Target window for message
- * @param {Object} [params.self=window] - Host window for message
- * @param {Object} [params.origin] - Origin of receiver
- * @param {String} [params.sendDirection] Wrapping messages into additional struct
- * ({ type: 'to_aepp' || 'to_waellet', data })
- * Used for handling messages between content script and page
- * @param {String} [params.receiveDirection='to_aepp'] Unwrapping messages from additional struct
- * ({ type: 'to_aepp' || 'to_waellet', data })
- * Used for handling messages between content script and page
- * @param {Boolean} [params.debug=false] - Debug flag
- * @return {Object}
- */
-export default stampit({
-  init ({
-    target = getTarget(),
-    self = window,
-    origin,
-    sendDirection,
-    receiveDirection = MESSAGE_DIRECTION.to_aepp,
-    debug = false,
-    forceOrigin = false
-  } = {}) {
-    if (sendDirection && !Object.keys(MESSAGE_DIRECTION).includes(sendDirection)) throw new MessageDirectionError(`sendDirection must be one of [${Object.keys(MESSAGE_DIRECTION)}]`)
-    if (!Object.keys(MESSAGE_DIRECTION).includes(receiveDirection)) throw new MessageDirectionError(`receiveDirection must be one of [${Object.keys(MESSAGE_DIRECTION)}]`)
-
-    const selfP = self
-    const targetP = target
-    this.origin = origin
-    this.debug = debug
-    this.forceOrigin = forceOrigin
-    this.sendDirection = sendDirection
-    this.receiveDirection = receiveDirection
-    this.subscribeFn = (listener) => selfP.addEventListener('message', listener, false)
-    this.unsubscribeFn = (listener) => selfP.removeEventListener('message', listener, false)
-    this.postFn = (msg) => targetP.postMessage(msg, this.origin || '*')
-  },
-  methods: { connect, sendMessage, disconnect, isConnected }
-}, WalletConnection)
diff --git a/src/utils/aepp-wallet-communication/connection/index.js b/src/utils/aepp-wallet-communication/connection/index.js
deleted file mode 100644
index c737fdc820..0000000000
--- a/src/utils/aepp-wallet-communication/connection/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Wallet Connection base module
- * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection
- * @export WalletConnection
- * @example
- * import WalletConnection from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection'
- */
-
-import { required } from '@stamp/required'
-
-/**
- * Basic Wallet Connection
- *
- * This stamp include interface for wallet connection functionality.
- * Attempting to create instances from the Stamp without overwriting all
- * abstract methods using composition will result in an exception.
- * @function
- * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection
- * @rtype Stamp
- * @param {Object} [options={}] - Initializer object
- * @return {Object} WalletConnection instance
- */
-export default required({
-  methods: {
-    connect: required,
-    disconnect: required,
-    sendMessage: required,
-    isConnected: required
-  }
-})
-
-/**
- * Connect
- * @function connect
- * @instance
- * @abstract
- * @rtype (onMessage: Function) => void
- * @param {Function} onMessage - Message handler
- * @return {void}
- */
-
-/**
- * Disconnect
- * @function disconnect
- * @instance
- * @abstract
- * @rtype () => void
- * @return {void}
- */
-
-/**
- * Send message
- * @function sendMessage
- * @instance
- * @abstract
- * @rtype (msg: Object) => void
- * @param {Object} msg - Message
- * @return {void}
- */
-
-/**
- * Check if connected
- * @function isConnected
- * @instance
- * @abstract
- * @rtype () => Boolean
- * @return {Boolean} Is connected
- */
diff --git a/src/utils/aepp-wallet-communication/content-script-bridge.js b/src/utils/aepp-wallet-communication/content-script-bridge.js
deleted file mode 100644
index bb203ab2d4..0000000000
--- a/src/utils/aepp-wallet-communication/content-script-bridge.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Content Script Bridge module
- *
- * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/content-script-bridge
- * @export ContentScriptBridge
- * @example
- * import ContentScriptBridge
- * from '@aeternity/aepp-sdk/es/utils/wallet-communication/content-script-bridge
- */
-import stampit from '@stamp/it'
-import { UnsupportedPlatformError, MissingParamError } from '../errors'
-
-/**
- * Start message proxy
- * @function run
- * @instance
- * @return {void}
- */
-function run () {
-  const allowCrossOrigin = this.allowCrossOrigin
-  // Connect to extension using runtime
-  this.extConnection.connect((msg) => {
-    this.pageConnection.sendMessage(msg)
-  })
-  // Connect to page using window.postMessage
-  this.pageConnection.connect((msg, origin, source) => {
-    if (!allowCrossOrigin && source !== window) return
-    this.extConnection.sendMessage(msg)
-  })
-}
-
-/**
- * Stop message proxy
- * @function stop
- * @instance
- * @return {void}
- */
-function stop () {
-  this.extConnection.disconnect()
-  this.pageConnection.disconnect()
-}
-
-/**
- * ContentScriptBridge stamp
- * Provide functionality to easly redirect messages from page to extension and from extension to
- * page through content script
- * Using Runtime(Extension) and WindowPostMessage(Web-Page) connections
- * @function
- * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/content-script-bridge
- * @rtype Stamp
- * @param {Object} params - Initializer object
- * @param {Object} params.pageConnection - Page connection object
- * (@link module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/
- * browser-window-message)
- * @param {Object} params.extConnection - Extension connection object
- * (@link module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/connection/browser-runtime)
- * @return {Object}
- */
-export default stampit({
-  init ({ pageConnection, extConnection, allowCrossOrigin = false }) {
-    if (!window) throw new UnsupportedPlatformError('Window object not found, you can run bridge only in browser')
-    if (!pageConnection) throw new MissingParamError('pageConnection required')
-    if (!extConnection) throw new MissingParamError('extConnection required')
-    this.allowCrossOrigin = allowCrossOrigin
-    this.pageConnection = pageConnection
-    this.extConnection = extConnection
-  },
-  methods: { run, stop }
-})
diff --git a/src/utils/aepp-wallet-communication/rpc/aepp-rpc.js b/src/utils/aepp-wallet-communication/rpc/aepp-rpc.js
index 24aa954424..bc4cd59d7a 100644
--- a/src/utils/aepp-wallet-communication/rpc/aepp-rpc.js
+++ b/src/utils/aepp-wallet-communication/rpc/aepp-rpc.js
@@ -4,7 +4,7 @@
  * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc
  * @export AeppRpc
  * @example
- * import ContentScriptBridge
+ * import AeppRpc
  * from '@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/rpc/aepp-rpc'
  */
 import { v4 as uuid } from '@aeternity/uuid'
diff --git a/src/utils/aepp-wallet-communication/wallet-detector.js b/src/utils/aepp-wallet-communication/wallet-detector.js
deleted file mode 100644
index 6c3ce2e83d..0000000000
--- a/src/utils/aepp-wallet-communication/wallet-detector.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * ISC License (ISC)
- * Copyright (c) 2018 aeternity developers
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
- *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
- *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- *  PERFORMANCE OF THIS SOFTWARE.
- */
-
-/**
- * Wallet Detector
- *
- * This is the complement to {@link module:@aeternity/aepp-sdk/es/utils}.
- * @module @aeternity/aepp-sdk/es/utils/aepp-wallet-communication/wallet-detector
- * @export WalletDetector
- */
-import stampit from '@stamp/it'
-import BrowserWindowMessageConnection from './connection/browser-window-message'
-import { MESSAGE_DIRECTION, METHODS } from './schema'
-import { UnsupportedPlatformError } from '../errors'
-
-/**
- * WalletDetector stamp
- * @function
- * @alias module:@aeternity/aepp-sdk/es/utils/aepp-wallet-communication/wallet-detector
- * @rtype Stamp
- * @param {Object} params={} - Initializer object
- * @param {WalletConnection} params.connection - Connection for listening for wallets
- * @return {WalletDetector}
- */
-export default stampit({
-  init ({ connection } = {}) {
-    if (!window) throw new UnsupportedPlatformError('Window object not found, you can run wallet detector only in browser')
-    this.connection = connection || BrowserWindowMessageConnection()
-    this.wallets = {}
-  },
-  methods: {
-    /**
-     * Start scanning
-     * @function scan
-     * @instance
-     * @param {Function} onDetected Call-back function which trigger on new wallet
-     * @return {void}
-     */
-    scan (onDetected) {
-      const { wallets } = this
-      this.connection.connect(({ method, params }, origin, source) => {
-        if (
-          !method || !params ||
-          method !== METHODS.readyToConnect || wallets[params.id]
-        ) return
-
-        const wallet = {
-          ...params,
-          async getConnection () {
-            // if detect extension wallet or page wallet
-            const isExtension = this.type === 'extension'
-            const origin = isExtension ? window.origin : this.origin
-            return BrowserWindowMessageConnection({
-              sendDirection: isExtension ? MESSAGE_DIRECTION.to_waellet : undefined,
-              receiveDirection: isExtension ? MESSAGE_DIRECTION.to_aepp : undefined,
-              target: source,
-              origin
-            })
-          }
-        }
-        wallets[wallet.id] = wallet
-        onDetected({ wallets, newWallet: wallet })
-      })
-      if (Object.keys(wallets).length) onDetected({ wallets })
-    },
-
-    /**
-    * Stop scanning
-    * @function stopScan
-    * @instance
-    * @return {void}
-    */
-    stopScan () {
-      this.connection.disconnect()
-    }
-  }
-})
diff --git a/src/utils/aepp-wallet-communication/wallet-detector.ts b/src/utils/aepp-wallet-communication/wallet-detector.ts
new file mode 100644
index 0000000000..0ea23ec872
--- /dev/null
+++ b/src/utils/aepp-wallet-communication/wallet-detector.ts
@@ -0,0 +1,69 @@
+/*
+ * ISC License (ISC)
+ * Copyright (c) 2022 aeternity developers
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ *  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ *  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ *  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ *  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ *  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ *  PERFORMANCE OF THIS SOFTWARE.
+ */
+
+import BrowserConnection from './connection/Browser'
+import BrowserWindowMessageConnection from './connection/BrowserWindowMessage'
+import { MESSAGE_DIRECTION, METHODS } from './schema'
+import { UnsupportedPlatformError } from '../errors'
+
+interface Wallet {
+  id: string
+  type: string
+  origin: string
+  getConnection: () => BrowserWindowMessageConnection
+}
+interface Wallets { [key: string]: Wallet }
+
+/**
+ * A function to detect available wallets
+ * @param connection connection to use to detect wallets
+ * @param onDetected call-back function which trigger on new wallet
+ * @returns a function to stop scanning
+ */
+export default (
+  connection: BrowserConnection = new BrowserWindowMessageConnection(),
+  onDetected: ({ wallets, newWallet }: { wallets: Wallets, newWallet?: Wallet }) => void
+): () => void => {
+  if (window == null) throw new UnsupportedPlatformError('Window object not found, you can run wallet detector only in browser')
+  const wallets: Wallets = {}
+
+  connection.connect((
+    { method, params }: { method: string, params: Omit<Wallet, 'getConnection'> },
+    origin: string,
+    source: Window
+  ) => {
+    if (method !== METHODS.readyToConnect || wallets[params.id] != null) return
+
+    const wallet = {
+      ...params,
+      getConnection () {
+        const isExtension = params.type === 'extension'
+        return new BrowserWindowMessageConnection({
+          sendDirection: isExtension ? MESSAGE_DIRECTION.to_waellet : undefined,
+          receiveDirection: isExtension ? MESSAGE_DIRECTION.to_aepp : undefined,
+          target: source,
+          origin: isExtension ? window.origin : params.origin
+        })
+      }
+    }
+    wallets[wallet.id] = wallet
+    onDetected({ wallets, newWallet: wallet })
+  }, () => {})
+  if (Object.keys(wallets).length > 0) onDetected({ wallets })
+
+  return () => connection.disconnect()
+}
diff --git a/src/utils/errors.ts b/src/utils/errors.ts
index 408be2ef97..b0f1aaa954 100644
--- a/src/utils/errors.ts
+++ b/src/utils/errors.ts
@@ -605,13 +605,6 @@ export class AlreadyConnectedError extends WalletError {
   }
 }
 
-export class MessageDirectionError extends WalletError {
-  constructor (message: string) {
-    super(message)
-    this.name = 'MessageDirectionError'
-  }
-}
-
 export class NoWalletConnectedError extends WalletError {
   constructor (message: string) {
     super(message)
diff --git a/test/integration/rpc.js b/test/integration/rpc.js
index f6ff3f0958..cc8a549880 100644
--- a/test/integration/rpc.js
+++ b/test/integration/rpc.js
@@ -21,7 +21,7 @@ import { MemoryAccount, Node, RpcAepp, RpcWallet, TX_TYPE, WALLET_TYPE } from '.
 import { concatBuffers } from '../../src/utils/other'
 import { unpackTx } from '../../src/tx/builder'
 import { decode } from '../../src/tx/builder/helpers'
-import BrowserWindowMessageConnection from '../../src/utils/aepp-wallet-communication/connection/browser-window-message'
+import BrowserWindowMessageConnection from '../../src/utils/aepp-wallet-communication/connection/BrowserWindowMessage'
 import { METHODS, RPC_STATUS } from '../../src/utils/aepp-wallet-communication/schema'
 import { generateKeyPair, verify, hash } from '../../src/utils/crypto'
 import { compilerUrl, account, networkId, url, ignoreVersion, spendPromise } from './'
@@ -30,7 +30,7 @@ import {
 } from '../../src/utils/errors'
 
 describe('Aepp<->Wallet', function () {
-  this.timeout(6000)
+  this.timeout(2000)
   let node
   let connections
   let connectionFromWalletToAepp
@@ -39,13 +39,13 @@ describe('Aepp<->Wallet', function () {
   before(async function () {
     node = await Node({ url, ignoreVersion })
     connections = getConnections()
-    connectionFromWalletToAepp = BrowserWindowMessageConnection({
-      self: connections.waelletConnection,
-      target: connections.aeppConnection
+    connectionFromWalletToAepp = new BrowserWindowMessageConnection({
+      self: connections.walletWindow,
+      target: connections.aeppWindow
     })
-    connectionFromAeppToWallet = BrowserWindowMessageConnection({
-      self: connections.aeppConnection,
-      target: connections.waelletConnection
+    connectionFromAeppToWallet = new BrowserWindowMessageConnection({
+      self: connections.aeppWindow,
+      target: connections.walletWindow
     })
   })
 
@@ -96,7 +96,7 @@ describe('Aepp<->Wallet', function () {
 
     it('Should receive `announcePresence` message from wallet', async () => {
       const isReceived = new Promise((resolve) => {
-        connections.aeppConnection.addEventListener('message', (msg) => {
+        connections.aeppWindow.addEventListener('message', (msg) => {
           resolve(msg.data.method === 'connection.announcePresence')
         })
       })
@@ -425,13 +425,13 @@ describe('Aepp<->Wallet', function () {
       wallet.onConnection = (aepp, actions) => {
         actions.accept()
       }
-      const id = wallet.addRpcClient(BrowserWindowMessageConnection({
-        self: connections.waelletConnection,
-        target: connections.aeppConnection
+      const id = wallet.addRpcClient(new BrowserWindowMessageConnection({
+        self: connections.walletWindow,
+        target: connections.aeppWindow
       }))
-      await aepp.connectToWallet(BrowserWindowMessageConnection({
-        self: connections.aeppConnection,
-        target: connections.waelletConnection
+      await aepp.connectToWallet(new BrowserWindowMessageConnection({
+        self: connections.aeppWindow,
+        target: connections.walletWindow
       }))
 
       wallet.removeRpcClient(id)
@@ -565,27 +565,23 @@ const WindowPostMessageFake = (name) => ({
   removeEventListener () {
     return () => null
   },
-  postMessage (msg) {
+  postMessage (source, msg) {
     this.messages.push(msg)
-    setTimeout(() => { if (typeof this.listener === 'function') this.listener({ data: msg, origin: 'testOrigin', source: this }) }, 0)
+    setTimeout(() => {
+      if (typeof this.listener === 'function') {
+        this.listener({ data: msg, origin: 'testOrigin', source })
+      }
+    })
   }
 })
 
-const getFakeConnections = (direct = false) => {
-  const waelletConnection = WindowPostMessageFake('wallet')
-  const aeppConnection = WindowPostMessageFake('aepp')
-  if (direct) {
-    const waelletP = waelletConnection.postMessage
-    const aeppP = aeppConnection.postMessage
-    waelletConnection.postMessage = aeppP.bind(aeppConnection)
-    aeppConnection.postMessage = waelletP.bind(waelletConnection)
-  }
-  return { waelletConnection, aeppConnection }
-}
-
-const getConnections = (direct) => {
+const getConnections = () => {
   global.chrome = { runtime: {} }
   global.window = { location: { origin: '//test' }, chrome: global.chrome }
   global.location = { protocol: 'http://test.com' }
-  return getFakeConnections(direct)
+  const walletWindow = WindowPostMessageFake('wallet')
+  const aeppWindow = WindowPostMessageFake('aepp')
+  walletWindow.postMessage = walletWindow.postMessage.bind(walletWindow, aeppWindow)
+  aeppWindow.postMessage = aeppWindow.postMessage.bind(aeppWindow, walletWindow)
+  return { walletWindow, aeppWindow }
 }