From b09f30e8df57db2a7dbb52ce62cfd88995818f14 Mon Sep 17 00:00:00 2001
From: Joey Pender <joey@ionic.io>
Date: Wed, 18 Oct 2023 09:18:24 -0500
Subject: [PATCH] fix: JS Engine Fixes (#55)

---
 .changeset/violet-schools-tie.md              |   8 +
 apps/example-app/ios/App/Podfile.lock         |   4 +-
 apps/example-app/src/background.js            |  35 +-
 apps/example-app/src/pages/Tab1.tsx           |  47 +-
 .../androidTestResultsUserPreferences.xml     | 156 +++++
 .../src/main/AndroidManifest.xml              |   1 +
 .../src/main/cpp/CMakeLists.txt               |  19 +-
 .../src/main/cpp/android_js_engine.cpp        |   8 -
 .../src/main/cpp/api/api_blob.cpp             | 131 ++++
 .../src/main/cpp/api/api_blob.h               |   9 +
 .../src/main/cpp/{ => api}/api_console.cpp    |  12 +-
 .../src/main/cpp/{ => api}/api_console.h      |  11 +-
 .../src/main/cpp/api/api_crypto.cpp           |  67 ++
 .../src/main/cpp/{ => api}/api_crypto.h       |   8 +-
 .../src/main/cpp/{ => api}/api_events.cpp     |  12 +-
 .../src/main/cpp/api/api_events.h             |   8 +
 .../src/main/cpp/api/api_fetch.cpp            | 114 ++++
 .../src/main/cpp/api/api_fetch.h              |   9 +
 .../src/main/cpp/api/api_js_response.cpp      | 359 +++++++++++
 .../src/main/cpp/api/api_js_response.h        |  11 +
 .../src/main/cpp/api/api_text.cpp             | 191 ++++++
 .../src/main/cpp/api/api_text.h               |   9 +
 .../src/main/cpp/{ => api}/api_timeout.cpp    |  43 +-
 .../src/main/cpp/{ => api}/api_timeout.h      |  10 +-
 .../src/main/cpp/api_crypto.cpp               |  96 ---
 .../src/main/cpp/api_device.cpp               |  62 --
 .../src/main/cpp/api_events.h                 |   8 -
 .../src/main/cpp/api_fetch.cpp                | 257 --------
 .../src/main/cpp/api_fetch.h                  |  18 -
 .../src/main/cpp/api_geolocation.cpp          |  33 -
 .../src/main/cpp/api_geolocation.h            |   8 -
 .../android-js-engine/src/main/cpp/api_kv.cpp | 107 ----
 .../src/main/cpp/api_notifications.cpp        |  27 -
 .../src/main/cpp/api_notifications.h          |   8 -
 .../src/main/cpp/api_text.cpp                 | 234 -------
 .../android-js-engine/src/main/cpp/api_text.h |   9 -
 .../src/main/cpp/cap_api/api_cap_device.cpp   |  60 ++
 .../api_cap_device.h}                         |   8 +-
 .../main/cpp/cap_api/api_cap_geolocation.cpp  |  32 +
 .../main/cpp/cap_api/api_cap_geolocation.h    |   8 +
 .../src/main/cpp/cap_api/api_cap_kv.cpp       |  84 +++
 .../cpp/{api_kv.h => cap_api/api_cap_kv.h}    |   8 +-
 .../cpp/cap_api/api_cap_notifications.cpp     |  31 +
 .../main/cpp/cap_api/api_cap_notifications.h  |   8 +
 .../src/main/cpp/context.cpp                  | 589 ++++++++----------
 .../android-js-engine/src/main/cpp/context.h  |  87 +--
 .../android-js-engine/src/main/cpp/errors.cpp |  53 +-
 .../android-js-engine/src/main/cpp/errors.h   |   6 +-
 .../android-js-engine/src/main/cpp/java.cpp   | 177 ++++++
 .../android-js-engine/src/main/cpp/java.h     |  51 ++
 .../src/main/cpp/jni_classes.cpp              | 118 ----
 .../src/main/cpp/jni_classes.h                |  38 --
 .../src/main/cpp/native_context.cpp           |  69 +-
 .../src/main/cpp/native_runner.cpp            |  13 +-
 .../src/main/cpp/quickjs/quickjs.c            |  14 +-
 .../src/main/cpp/quickjs/quickjs.h            |   1 +
 .../android-js-engine/src/main/cpp/runner.cpp | 105 +++-
 .../android-js-engine/src/main/cpp/runner.h   |  26 +-
 .../io/ionic/android_js_engine/Context.kt     |  65 +-
 .../io/ionic/android_js_engine/ContextAPI.kt  |  91 ---
 .../ionic/android_js_engine/EngineErrors.kt   |   2 +
 .../io/ionic/android_js_engine/NativeLib.kt   |  17 -
 .../java/io/ionic/android_js_engine/Runner.kt |  69 +-
 .../java/io/ionic/android_js_engine/WebAPI.kt |  98 +++
 .../io/ionic/backgroundrunner/ContextTests.kt | 176 ++++--
 .../io/ionic/backgroundrunner/RunnerTests.kt  |  66 ++
 .../android/src/main/AndroidManifest.xml      |   1 +
 .../plugin/BackgroundRunner.kt                |  53 +-
 .../plugin/BackgroundRunnerPlugin.kt          |   3 +-
 .../backgroundrunner/plugin/RunnerWorker.kt   |   3 +
 .../ios/Plugin/BackgroundRunner.swift         |  65 +-
 .../ios/Plugin/BackgroundRunnerPlugin.swift   |   3 +-
 .../ios/Plugin/Context+CapacitorAPI.swift     |  10 +-
 .../Sources/RunnerEngine/Context.swift        |  71 +--
 .../Sources/RunnerEngine/Errors.swift         |   1 +
 .../Sources/RunnerEngine/Runner.swift         |  46 +-
 .../RunnerEngineTests/ContextTests.swift      |  18 +-
 .../Tests/RunnerEngineTests/RunnerTests.swift |  49 +-
 78 files changed, 2652 insertions(+), 1990 deletions(-)
 create mode 100644 .changeset/violet-schools-tie.md
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/android_js_engine.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.h
 rename packages/android-engine/android-js-engine/src/main/cpp/{ => api}/api_console.cpp (86%)
 rename packages/android-engine/android-js-engine/src/main/cpp/{ => api}/api_console.h (73%)
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.cpp
 rename packages/android-engine/android-js-engine/src/main/cpp/{ => api}/api_crypto.h (53%)
 rename packages/android-engine/android-js-engine/src/main/cpp/{ => api}/api_events.cpp (65%)
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_events.h
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.h
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.h
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_text.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api/api_text.h
 rename packages/android-engine/android-js-engine/src/main/cpp/{ => api}/api_timeout.cpp (56%)
 rename packages/android-engine/android-js-engine/src/main/cpp/{ => api}/api_timeout.h (70%)
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_crypto.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_device.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_events.h
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_fetch.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_fetch.h
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.h
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_kv.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_notifications.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_notifications.h
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_text.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/api_text.h
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.cpp
 rename packages/android-engine/android-js-engine/src/main/cpp/{api_device.h => cap_api/api_cap_device.h} (52%)
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.h
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.cpp
 rename packages/android-engine/android-js-engine/src/main/cpp/{api_kv.h => cap_api/api_cap_kv.h} (60%)
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.h
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/java.cpp
 create mode 100644 packages/android-engine/android-js-engine/src/main/cpp/java.h
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/jni_classes.cpp
 delete mode 100644 packages/android-engine/android-js-engine/src/main/cpp/jni_classes.h
 delete mode 100644 packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/ContextAPI.kt
 delete mode 100644 packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/NativeLib.kt
 create mode 100644 packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/WebAPI.kt
 create mode 100644 packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/RunnerTests.kt

diff --git a/.changeset/violet-schools-tie.md b/.changeset/violet-schools-tie.md
new file mode 100644
index 0000000..1cfc05c
--- /dev/null
+++ b/.changeset/violet-schools-tie.md
@@ -0,0 +1,8 @@
+---
+"@capacitor/background-runner": minor
+---
+
+Reliability fixes for the JS Engine used in the Background Runner:
+- (Android) Improvements to QuickJS integration
+- (Android / iOS) Improvements in the handling of multiple dispatched events
+
diff --git a/apps/example-app/ios/App/Podfile.lock b/apps/example-app/ios/App/Podfile.lock
index 6e70d0e..1451279 100644
--- a/apps/example-app/ios/App/Podfile.lock
+++ b/apps/example-app/ios/App/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
     - CapacitorCordova
   - CapacitorApp (5.0.6):
     - Capacitor
-  - CapacitorBackgroundRunner (1.0.0):
+  - CapacitorBackgroundRunner (1.0.5):
     - Capacitor
   - CapacitorCordova (5.2.2)
   - CapacitorHaptics (5.0.6):
@@ -41,7 +41,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Capacitor: 070b18988e0f566728ae9a5eb3a7a974595f1626
   CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
-  CapacitorBackgroundRunner: 40b23c5d087ed6ee582efae59784a4b2ec416962
+  CapacitorBackgroundRunner: f2415aebbcea4e744eb45f785a50f07ba72f1d0b
   CapacitorCordova: 3773395d5331add072300ff6041ca2cf7b93cb0b
   CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
   CapacitorKeyboard: b978154b024a5f65e044908e37d15b7de58b9d12
diff --git a/apps/example-app/src/background.js b/apps/example-app/src/background.js
index dd4a604..c3dbcfb 100644
--- a/apps/example-app/src/background.js
+++ b/apps/example-app/src/background.js
@@ -61,13 +61,21 @@ addEventListener("fetchTest", async (resolve, reject, args) => {
 });
 
 // capacitor APIs
-addEventListener("testCapKV", async (resolve, reject, args) => {
+addEventListener("testCapKVSet", async (resolve, reject, args) => {
   try {
-    CapacitorKV.set("testValue", "hello world");
+    CapacitorKV.set("testValue", args.value);
+    resolve();
+  } catch (err) {
+    console.error(err);
+    reject(err);
+  }
+});
 
+addEventListener("testCapKVGet", async (resolve, reject, args) => {
+  try {
     const result = CapacitorKV.get("testValue");
-    console.log("test value is: " + result);
-
+    console.log(result);
+    console.log(JSON.stringify(result));
     resolve(result);
   } catch (err) {
     console.error(err);
@@ -75,10 +83,20 @@ addEventListener("testCapKV", async (resolve, reject, args) => {
   }
 });
 
+addEventListener("testCapKVRemove", async (resolve, reject, args) => {
+  try {
+    CapacitorKV.remove("testValue");
+    resolve();
+  } catch (err) {
+    console.error(err);
+    reject(err);
+  }
+});
+
 addEventListener("testCapNotification", async (resolve, reject, args) => {
   try {
     let scheduleDate = new Date();
-    scheduleDate.setSeconds(scheduleDate.getSeconds() + 30);
+    scheduleDate.setSeconds(scheduleDate.getSeconds() + 60);
 
     CapacitorNotifications.schedule([
       {
@@ -109,7 +127,7 @@ addEventListener("testCapacitorGeolocation", async (resolve, reject, args) => {
 
 addEventListener(
   "testCapacitorDeviceBatteryStatus",
-  async (resolve, reject, args) => {
+  (resolve, reject, args) => {
     try {
       const info = CapacitorDevice.getBatteryStatus();
       console.log(JSON.stringify(info));
@@ -123,7 +141,7 @@ addEventListener(
 
 addEventListener(
   "testCapacitorDeviceNetworkStatus",
-  async (resolve, reject, args) => {
+  (resolve, reject, args) => {
     try {
       const info = CapacitorDevice.getNetworkStatus();
       console.log(JSON.stringify(info));
@@ -153,7 +171,7 @@ addEventListener("remoteNotification", (resolve, reject, args) => {
 
 addEventListener("checkWatchReachability", (resolve, reject, args) => {
   const reachable = CapacitorWatch.isReachable();
-
+  try {
     resolve({
       reachable: reachable,
     });
@@ -170,6 +188,7 @@ addEventListener("sendMessageToWatch", (resolve, reject, args) => {
     msg: "Hello World",
   });
 
+  try {
     resolve();
   } catch (err) {
     console.error(err);
diff --git a/apps/example-app/src/pages/Tab1.tsx b/apps/example-app/src/pages/Tab1.tsx
index c691cf9..9f6067d 100644
--- a/apps/example-app/src/pages/Tab1.tsx
+++ b/apps/example-app/src/pages/Tab1.tsx
@@ -37,21 +37,58 @@ const Tab1: React.FC = () => {
     }
   };
 
-  const onTestCapKV = async () => {
+  const onTestCapKVSet = async () => {
+    setCommandOutput("");
+    try {
+      await BackgroundRunner.dispatchEvent({
+        label: "com.example.background.task",
+        event: "testCapKVSet",
+        details: {
+          value: "Hello World"
+        },
+      });
+      setCommandOutput(
+        `success: stored value 'Hello World'`
+      );
+    } catch (err) {
+      setCommandOutput(`ERROR: ${err}`);
+    }
+  };
+
+  const onTestCapKVGet = async () => {
     setCommandOutput("");
     try {
       const response = await BackgroundRunner.dispatchEvent({
         label: "com.example.background.task",
-        event: "testCapKV",
+        event: "testCapKVGet",
         details: {},
       });
       setCommandOutput(
-        `success: stored and retrieved ${JSON.stringify(response)}`
+        `success: retrieved ${JSON.stringify(response)}`
+      );
+    } catch (err) {
+      setCommandOutput(`ERROR: ${err}`);
+    }
+  };
+
+  const onTestCapKVRemove = async () => {
+    setCommandOutput("");
+    try {
+      await BackgroundRunner.dispatchEvent({
+        label: "com.example.background.task",
+        event: "testCapKVRemove",
+        details: {
+          
+        },
+      });
+      setCommandOutput(
+        `success: value removed`
       );
     } catch (err) {
       setCommandOutput(`ERROR: ${err}`);
     }
   };
+  
 
   const onTestCapNotification = async () => {
     setCommandOutput("");
@@ -135,7 +172,9 @@ const Tab1: React.FC = () => {
         <IonButton expand="block" color={"success"} onClick={onRequestPermissions}>
           Request API Permissions
         </IonButton>
-        <IonButton expand="block" onClick={onTestCapKV}>Test Capacitor KV</IonButton>
+        <IonButton expand="block" onClick={onTestCapKVSet}>Capacitor KV - Set</IonButton>
+        <IonButton expand="block" onClick={onTestCapKVGet}>Capacitor KV - Get</IonButton>
+        <IonButton expand="block" onClick={onTestCapKVRemove}>Capacitor KV - Delete</IonButton>
         <IonButton expand="block" onClick={onTestCapNotification}>
           Test Capacitor Notification
         </IonButton>
diff --git a/packages/android-engine/.idea/androidTestResultsUserPreferences.xml b/packages/android-engine/.idea/androidTestResultsUserPreferences.xml
index e974d10..ce81574 100644
--- a/packages/android-engine/.idea/androidTestResultsUserPreferences.xml
+++ b/packages/android-engine/.idea/androidTestResultsUserPreferences.xml
@@ -3,6 +3,19 @@
   <component name="AndroidTestResultsUserPreferences">
     <option name="androidTestResultsTableState">
       <map>
+        <entry key="-2116463108">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="-2089394189">
           <value>
             <AndroidTestResultsTableState>
@@ -22,6 +35,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
@@ -42,6 +56,45 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="-1854815990">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-1822476680">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-1695768936">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="-1393843449">
           <value>
             <AndroidTestResultsTableState>
@@ -61,6 +114,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
@@ -68,12 +122,27 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="-1215918895">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="HUAWEI ANE-LX3" value="120" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="-843520902">
           <value>
             <AndroidTestResultsTableState>
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
@@ -94,16 +163,84 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="-252070149">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="-100913809">
           <value>
             <AndroidTestResultsTableState>
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="HUAWEI ANE-LX3" value="120" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="R5CR50ZSBZB" value="120" />
                   <entry key="Tests" value="360" />
                   <entry key="samsung&#10; SM-G991U1" value="120" />
+                  <entry key="samsung SM-G991U1" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-85812504">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="168925976">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="325304854">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="966636752">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
                 </map>
               </option>
             </AndroidTestResultsTableState>
@@ -115,8 +252,10 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
+                  <entry key="samsung SM-G991U1" value="120" />
                 </map>
               </option>
             </AndroidTestResultsTableState>
@@ -128,6 +267,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
@@ -141,6 +281,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
@@ -154,8 +295,23 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
                   <entry key="Pixel_6_Pro_API_33" value="120" />
                   <entry key="Tests" value="360" />
+                  <entry key="samsung SM-G991U1" value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="2001202769">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_4_API_33" value="120" />
+                  <entry key="Tests" value="360" />
                 </map>
               </option>
             </AndroidTestResultsTableState>
diff --git a/packages/android-engine/android-js-engine/src/main/AndroidManifest.xml b/packages/android-engine/android-js-engine/src/main/AndroidManifest.xml
index 9100e2c..8a9a80f 100644
--- a/packages/android-engine/android-js-engine/src/main/AndroidManifest.xml
+++ b/packages/android-engine/android-js-engine/src/main/AndroidManifest.xml
@@ -2,5 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 </manifest>
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/CMakeLists.txt b/packages/android-engine/android-js-engine/src/main/cpp/CMakeLists.txt
index 62631a8..5eb89fa 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/CMakeLists.txt
+++ b/packages/android-engine/android-js-engine/src/main/cpp/CMakeLists.txt
@@ -5,8 +5,23 @@ project("android_js_engine")
 add_library(
         ${PROJECT_NAME}
         SHARED
-        errors.cpp jni_classes.cpp context.cpp runner.cpp native_runner.cpp native_context.cpp api_console.cpp api_crypto.cpp api_events.cpp api_text.cpp api_timeout.cpp api_fetch.cpp
-        api_kv.cpp api_device.cpp api_notifications.cpp api_geolocation.cpp
+        native_runner.cpp native_context.cpp
+
+        runner.cpp context.cpp errors.cpp java.cpp
+
+        api/api_console.cpp
+        api/api_events.cpp
+        api/api_timeout.cpp
+        api/api_crypto.cpp
+        api/api_text.cpp
+        api/api_fetch.cpp
+        api/api_js_response.cpp
+        api/api_blob.cpp
+
+        cap_api/api_cap_kv.cpp
+        cap_api/api_cap_device.cpp
+        cap_api/api_cap_geolocation.cpp
+        cap_api/api_cap_notifications.cpp
 )
 
 find_library(
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/android_js_engine.cpp b/packages/android-engine/android-js-engine/src/main/cpp/android_js_engine.cpp
deleted file mode 100644
index c1bb1b2..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/android_js_engine.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <jni.h>
-
-#include <string>
-
-extern "C" JNIEXPORT jstring JNICALL Java_io_ionic_android_1js_1engine_NativeLib_stringFromJNI(JNIEnv* env, jobject /* this */) {
-  std::string hello = "Hello from C++";
-  return env->NewStringUTF(hello.c_str());
-}
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.cpp
new file mode 100644
index 0000000..e9dc6a7
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.cpp
@@ -0,0 +1,131 @@
+#include "api_blob.h"
+
+#include "../context.h"
+#include "../errors.h"
+#include "../quickjs/cutils.h"
+
+struct blob_data {
+  uint8_t *data;
+  size_t size;
+};
+
+static JSClassID js_blob_class_id;
+
+static void js_blob_data_finalizer(JSRuntime *rt, JSValue val) {
+  auto *blob = (blob_data *)JS_GetOpaque(val, js_blob_class_id);
+  if (blob != nullptr) {
+    delete blob;
+  }
+}
+
+static JSClassDef js_blob_class = {"Blob", .finalizer = js_blob_data_finalizer};
+
+static JSValue api_blob_get_array_buffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *blob = (blob_data *)JS_GetOpaque(this_val, js_blob_class_id);
+  if (blob == nullptr) {
+    return throw_js_exception(ctx, "backing data is null");
+  }
+
+  auto array_buffer = JS_NewArrayBuffer(ctx, blob->data, blob->size, nullptr, nullptr, 0);
+  auto buf = JS_NewUInt8Array(ctx, array_buffer, 0, blob->size);
+
+  JS_FreeValue(ctx, array_buffer);
+
+  return buf;
+}
+
+static JSValue api_blob_get_text(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *blob = (blob_data *)JS_GetOpaque(this_val, js_blob_class_id);
+  if (blob == nullptr) {
+    return throw_js_exception(ctx, "backing data is null");
+  }
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
+
+  jstring encoding = env->NewStringUTF("utf-8");
+  jbyteArray j_byte_array = env->NewByteArray(blob->size);
+
+  env->SetByteArrayRegion(j_byte_array, 0, blob->size, reinterpret_cast<const jbyte *>(blob->data));
+
+  auto *text_string = (jstring)env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_byteArrayToString_method, j_byte_array, encoding);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  const char *text_c_string = env->GetStringUTFChars(text_string, nullptr);
+
+  return JS_NewString(ctx, text_c_string);
+}
+
+static const JSCFunctionListEntry js_blob_proto_funcs[] = {
+    JS_CFUNC_DEF("arrayBuffer", 0, api_blob_get_array_buffer),
+    JS_CFUNC_DEF("text", 0, api_blob_get_text),
+};
+
+static JSValue api_blob_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv) {
+  auto proto = JS_GetClassProto(ctx, js_blob_class_id);
+  auto new_object = JS_NewObjectProtoClass(ctx, proto, js_blob_class_id);
+
+  JS_FreeValue(ctx, proto);
+
+  JSValue input_arr = argv[0];
+
+  // TODO: Revisit this later
+  //    if (!JS_IsArray(ctx, input_arr)) {
+  //        input_arr = JS_NewArray(ctx);
+  //    }
+
+  uint8_t *data;
+  size_t size, offset, bytes;
+
+  auto typed_arr = JS_GetTypedArrayBuffer(ctx, input_arr, &offset, &size, &bytes);
+
+  data = JS_GetArrayBuffer(ctx, &size, typed_arr);
+
+  auto *blob = new blob_data;
+  blob->data = data;
+  blob->size = size;
+
+  JS_SetOpaque(new_object, blob);
+
+  JS_SetPropertyStr(ctx, new_object, "size", JS_NewInt32(ctx, blob->size));
+
+  JS_FreeValue(ctx, typed_arr);
+  JS_FreeValue(ctx, input_arr);
+
+  return new_object;
+}
+
+JSValue new_blob(JSContext *ctx, uint8_t *data, size_t size) {
+  JSValueConst args[1];
+
+  auto array_buffer = JS_NewArrayBuffer(ctx, data, size, nullptr, nullptr, 0);
+  args[0] = JS_NewUInt8Array(ctx, array_buffer, 0, size);
+
+  JS_FreeValue(ctx, array_buffer);
+
+  return api_blob_constructor(ctx, JS_UNDEFINED, 1, args);
+}
+
+void init_blob_class(JSContext *ctx) {
+  JSValue blob_proto, obj;
+
+  JS_NewClassID(&js_blob_class_id);
+  JS_NewClass(JS_GetRuntime(ctx), js_blob_class_id, &js_blob_class);
+
+  blob_proto = JS_NewObject(ctx);
+
+  JS_SetPropertyFunctionList(ctx, blob_proto, js_blob_proto_funcs, countof(js_blob_proto_funcs));
+  JS_SetClassProto(ctx, js_blob_class_id, blob_proto);
+
+  obj = JS_NewCFunction2(ctx, api_blob_constructor, "Blob", 1, JS_CFUNC_constructor, 1);
+
+  JSValue global_obj = JS_GetGlobalObject(ctx);
+  JS_SetPropertyStr(ctx, global_obj, "Blob", obj);
+  JS_FreeValue(ctx, global_obj);
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.h
new file mode 100644
index 0000000..5f1c35c
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_blob.h
@@ -0,0 +1,9 @@
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_BLOB_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_BLOB_H
+
+#include "../quickjs/quickjs.h"
+
+void init_blob_class(JSContext *ctx);
+JSValue new_blob(JSContext *ctx, uint8_t *data, size_t size);
+
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_BLOB_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_console.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_console.cpp
similarity index 86%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_console.cpp
rename to packages/android-engine/android-js-engine/src/main/cpp/api/api_console.cpp
index e681175..c0a7729 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_console.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_console.cpp
@@ -1,6 +1,6 @@
 #include "api_console.h"
 
-#include "context.h"
+#include "../context.h"
 
 void write_to_logcat(android_LogPriority priority, const char *tag, const char *message) { __android_log_write(priority, tag, message); }
 
@@ -10,7 +10,7 @@ JSValue api_console_log(JSContext *ctx, JSValueConst this_val, int argc, JSValue
   size_t len;
 
   auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  std::string tag = "[Runner Context " + parent_ctx->name + "]";
+  std::string const tag = "[Runner Context " + parent_ctx->name + "]";
 
   for (i = 0; i < argc; i++) {
     str = JS_ToCStringLen(ctx, &len, argv[i]);
@@ -32,7 +32,7 @@ JSValue api_console_warn(JSContext *ctx, JSValueConst this_val, int argc, JSValu
   size_t len;
 
   auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  std::string tag = "[Runner Context " + parent_ctx->name + "]";
+  std::string const tag = "[Runner Context " + parent_ctx->name + "]";
 
   for (i = 0; i < argc; i++) {
     str = JS_ToCStringLen(ctx, &len, argv[i]);
@@ -54,7 +54,7 @@ JSValue api_console_error(JSContext *ctx, JSValueConst this_val, int argc, JSVal
   size_t len;
 
   auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  std::string tag = "[Runner Context " + parent_ctx->name + "]";
+  std::string const tag = "[Runner Context " + parent_ctx->name + "]";
 
   for (i = 0; i < argc; i++) {
     str = JS_ToCStringLen(ctx, &len, argv[i]);
@@ -76,7 +76,7 @@ JSValue api_console_debug(JSContext *ctx, JSValueConst this_val, int argc, JSVal
   size_t len;
 
   auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  std::string tag = "[Runner Context " + parent_ctx->name + "]";
+  std::string const tag = "[Runner Context " + parent_ctx->name + "]";
 
   for (i = 0; i < argc; i++) {
     str = JS_ToCStringLen(ctx, &len, argv[i]);
@@ -90,4 +90,4 @@ JSValue api_console_debug(JSContext *ctx, JSValueConst this_val, int argc, JSVal
   }
 
   return JS_UNDEFINED;
-}
+}
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_console.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_console.h
similarity index 73%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_console.h
rename to packages/android-engine/android-js-engine/src/main/cpp/api/api_console.h
index 75537b0..1965709 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_console.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_console.h
@@ -1,9 +1,8 @@
-#include <android/log.h>
-
-#include "quickjs/quickjs.h"
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_CONSOLE_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_CONSOLE_H
 
-#ifndef ANDROID_ENGINE_API_CONSOLE_H
-#define ANDROID_ENGINE_API_CONSOLE_H
+#include <android/log.h>
+#include "../quickjs/quickjs.h"
 
 void write_to_logcat(android_LogPriority priority, const char *tag, const char *message);
 
@@ -12,4 +11,4 @@ JSValue api_console_warn(JSContext *ctx, JSValueConst this_val, int argc, JSValu
 JSValue api_console_error(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 JSValue api_console_debug(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 
-#endif //ANDROID_ENGINE_API_CONSOLE_H
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_CONSOLE_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.cpp
new file mode 100644
index 0000000..9af7a35
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.cpp
@@ -0,0 +1,67 @@
+#include "api_crypto.h"
+
+#include "../context.h"
+#include "../errors.h"
+
+JSValue api_crypto_get_random_values(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  uint8_t *buf;
+  size_t elem, len, offset, buf_size;
+  int size;
+
+  auto t_arr_buf = JS_GetTypedArrayBuffer(ctx, argv[0], &offset, &len, &elem);
+  buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr_buf);
+
+  if (!buf) {
+    return JS_EXCEPTION;
+  }
+
+  size = buf_size;
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
+
+  auto random_bytes = static_cast<jbyteArray>(env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_cryptoGetRandom_method, size));
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  auto random = env->GetByteArrayElements(random_bytes, nullptr);
+
+  for (int i = 0; i < size; i++) {
+    buf[i] = random[i];
+  }
+
+  env->ReleaseByteArrayElements(random_bytes, random, 0);
+
+  JS_FreeValue(ctx, t_arr_buf);
+
+  return JS_DupValue(ctx, argv[0]);
+}
+
+JSValue api_crypto_random_uuid(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
+
+  auto *str = (jstring)env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_cryptoRandomUUID_method);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  const auto *c_str = env->GetStringUTFChars(str, nullptr);
+
+  auto ret_value = JS_NewString(ctx, c_str);
+
+  env->ReleaseStringUTFChars(str, c_str);
+
+  return ret_value;
+}
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_crypto.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.h
similarity index 53%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_crypto.h
rename to packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.h
index 89dffa7..e5f70ef 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_crypto.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_crypto.h
@@ -1,9 +1,9 @@
-#include "quickjs/quickjs.h"
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_CRYPTO_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_CRYPTO_H
 
-#ifndef ANDROID_ENGINE_API_CRYPTO_H
-#define ANDROID_ENGINE_API_CRYPTO_H
+#include "../quickjs/quickjs.h"
 
 JSValue api_crypto_get_random_values(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 JSValue api_crypto_random_uuid(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 
-#endif //ANDROID_ENGINE_API_CRYPTO_H
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_CRYPTO_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_events.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_events.cpp
similarity index 65%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_events.cpp
rename to packages/android-engine/android-js-engine/src/main/cpp/api/api_events.cpp
index 6b1e0c3..8747ed2 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_events.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_events.cpp
@@ -1,6 +1,6 @@
 #include "api_events.h"
 
-#include "context.h"
+#include "../context.h"
 
 JSValue api_add_event_listener(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
   const char *event = JS_ToCString(ctx, argv[0]);
@@ -13,11 +13,11 @@ JSValue api_add_event_listener(JSContext *ctx, JSValueConst this_val, int argc,
 
   callback = JS_DupValue(ctx, callback);
 
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto itr = parent_ctx->event_listeners.find(event);
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto itr = context->event_listeners.find(event);
 
-  if (itr == parent_ctx->event_listeners.end()) {
-    parent_ctx->event_listeners.emplace(event, callback);
+  if (itr == context->event_listeners.end()) {
+    context->event_listeners.emplace(event, callback);
   } else {
     JS_FreeValue(ctx, itr->second);
     itr->second = callback;
@@ -26,4 +26,4 @@ JSValue api_add_event_listener(JSContext *ctx, JSValueConst this_val, int argc,
   JS_FreeCString(ctx, event);
 
   return JS_UNDEFINED;
-}
\ No newline at end of file
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_events.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_events.h
new file mode 100644
index 0000000..351d8b1
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_events.h
@@ -0,0 +1,8 @@
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_EVENTS_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_EVENTS_H
+
+#include "../quickjs/quickjs.h"
+
+JSValue api_add_event_listener(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_EVENTS_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.cpp
new file mode 100644
index 0000000..01f2c10
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.cpp
@@ -0,0 +1,114 @@
+#include "api_fetch.h"
+
+#include "../context.h"
+#include "../errors.h"
+
+JSValue js_fetch_job(JSContext *ctx, int argc, JSValueConst *argv) {
+  JSValue resolve, reject, request, options;
+
+  resolve = argv[0];
+  reject = argv[1];
+  request = argv[2];
+  options = argv[3];
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  if (context == nullptr) {
+    auto exception = throw_js_exception(ctx, "parent context is null");
+    reject_promise(ctx, reject, exception);
+    return JS_UNDEFINED;
+  }
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    auto exception = throw_js_exception(ctx, "JVM Environment is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  if (JS_IsNull(request) || !JS_IsString(request)) {
+    auto exception = throw_js_exception(ctx, "invalid url");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  const auto *c_url_str = JS_ToCString(ctx, request);
+  auto *j_url_str = env->NewStringUTF(c_url_str);
+
+  jobject j_options = nullptr;
+
+  if (!JS_IsNull(options) && !JS_IsUndefined(options)) {
+    auto options_json_value = JS_JSONStringify(ctx, options, JS_UNDEFINED, JS_UNDEFINED);
+    const auto *options_json_c_str = JS_ToCString(ctx, options_json_value);
+    auto *options_json_j_str = env->NewStringUTF(options_json_c_str);
+
+    j_options = env->NewObject(context->java->js_fetch_options_class, context->java->js_fetch_options_constructor, options_json_j_str);
+    auto exception = throw_jvm_exception_in_js(env, ctx);
+    if (JS_IsException(exception)) {
+      reject_promise(ctx, reject, exception);
+      JS_FreeValue(ctx, exception);
+      return JS_UNDEFINED;
+    }
+
+    JS_FreeCString(ctx, options_json_c_str);
+    JS_FreeValue(ctx, options_json_value);
+  }
+
+  auto response = env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_fetch_method, j_url_str, j_options);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  auto js_response = new_js_response(ctx, response);
+
+  auto ok = JS_GetPropertyStr(ctx, js_response, "ok");
+  if (!JS_ToBool(ctx, ok)) {
+    auto err = JS_GetPropertyStr(ctx, js_response, "error");
+    reject_promise(ctx, reject, err);
+
+    JS_FreeValue(ctx, ok);
+    JS_FreeValue(ctx, err);
+    JS_FreeValue(ctx, js_response);
+    return JS_UNDEFINED;
+  }
+
+  auto global_obj = JS_GetGlobalObject(ctx);
+  JSValueConst resolve_args[1];
+  resolve_args[0] = js_response;
+
+  JS_Call(ctx, resolve, global_obj, 1, resolve_args);
+
+  JS_FreeValue(ctx, ok);
+  JS_FreeValue(ctx, global_obj);
+  JS_FreeValue(ctx, js_response);
+
+  return JS_UNDEFINED;
+}
+
+JSValue api_fetch(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
+  JSValue promise, resolving_funcs[2];
+  JSValueConst args[4];
+
+  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+  if (JS_IsException(promise)) {
+    return promise;
+  }
+
+  args[0] = resolving_funcs[0];
+  args[1] = resolving_funcs[1];
+  args[2] = JS_DupValue(ctx, argv[0]);
+  args[3] = JS_DupValue(ctx, argv[1]);
+
+  JS_EnqueueJob(ctx, js_fetch_job, 4, args);
+
+  JS_FreeValue(ctx, resolving_funcs[0]);
+  JS_FreeValue(ctx, resolving_funcs[1]);
+  JS_FreeValue(ctx, argv[0]);
+  JS_FreeValue(ctx, argv[1]);
+
+  return promise;
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.h
new file mode 100644
index 0000000..5e4d74b
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_fetch.h
@@ -0,0 +1,9 @@
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_FETCH_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_FETCH_H
+
+#include "../quickjs/quickjs.h"
+#include "api_js_response.h"
+
+JSValue api_fetch(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv);
+
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_FETCH_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.cpp
new file mode 100644
index 0000000..d6364e8
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.cpp
@@ -0,0 +1,359 @@
+#include "api_js_response.h"
+
+#include "../context.h"
+#include "../errors.h"
+#include "../quickjs/cutils.h"
+
+struct response_data {
+  uint8_t *data;
+  size_t size;
+};
+
+static JSClassID js_response_class_id;
+
+JSValue js_response_json_job(JSContext *ctx, int argc, JSValueConst *argv) {
+  JSValue resolve, reject, response;
+
+  resolve = argv[0];
+  reject = argv[1];
+  response = argv[2];
+
+  auto *data = (response_data *)JS_GetOpaque(response, js_response_class_id);
+  if (data == nullptr) {
+    auto exception = throw_js_exception(ctx, "backing data is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    auto exception = throw_js_exception(ctx, "JVM Environment is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  jstring encoding = env->NewStringUTF("utf-8");
+  jbyteArray j_byte_array = env->NewByteArray(data->size);
+
+  env->SetByteArrayRegion(j_byte_array, 0, data->size, reinterpret_cast<const jbyte *>(data->data));
+
+  auto json_string = (jstring)env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_byteArrayToString_method, j_byte_array, encoding);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  const char *json_c_string = env->GetStringUTFChars(json_string, nullptr);
+
+  auto global_obj = JS_GetGlobalObject(ctx);
+
+  if (json_c_string != nullptr && strlen(json_c_string) > 0) {
+    auto json = JS_ParseJSON(ctx, json_c_string, strlen(json_c_string), "<json>");
+    auto res = JS_Call(ctx, resolve, global_obj, 1, (JSValueConst *)&json);
+    JS_FreeValue(ctx, res);
+    JS_FreeValue(ctx, json);
+  } else {
+    auto res = JS_Call(ctx, resolve, global_obj, 0, nullptr);
+    JS_FreeValue(ctx, res);
+  }
+
+  JS_FreeValue(ctx, global_obj);
+
+  return JS_UNDEFINED;
+}
+
+JSValue js_response_text_job(JSContext *ctx, int argc, JSValueConst *argv) {
+  JSValue resolve, reject, response;
+
+  resolve = argv[0];
+  reject = argv[1];
+  response = argv[2];
+
+  auto *data = (response_data *)JS_GetOpaque(response, js_response_class_id);
+  if (data == nullptr) {
+    auto exception = throw_js_exception(ctx, "backing data is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    auto exception = throw_js_exception(ctx, "JVM Environment is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  jstring encoding = env->NewStringUTF("utf-8");
+  jbyteArray j_byte_array = env->NewByteArray(data->size);
+
+  env->SetByteArrayRegion(j_byte_array, 0, data->size, reinterpret_cast<const jbyte *>(data->data));
+
+  auto text_string = (jstring)env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_byteArrayToString_method, j_byte_array, encoding);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  const char *text_c_string = env->GetStringUTFChars(text_string, nullptr);
+  auto text = JS_NewString(ctx, text_c_string);
+
+  JSValueConst resolve_args[1];
+  resolve_args[0] = text;
+
+  auto global_obj = JS_GetGlobalObject(ctx);
+  JS_Call(ctx, resolve, global_obj, 1, resolve_args);
+
+  JS_FreeValue(ctx, text);
+  JS_FreeValue(ctx, global_obj);
+
+  return JS_UNDEFINED;
+}
+
+JSValue js_response_array_buffer_job(JSContext *ctx, int argc, JSValueConst *argv) {
+  JSValue resolve, reject, response;
+
+  resolve = argv[0];
+  reject = argv[1];
+  response = argv[2];
+
+  auto *data = (response_data *)JS_GetOpaque(response, js_response_class_id);
+  if (data == nullptr) {
+    auto exception = throw_js_exception(ctx, "backing data is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  auto array_buffer = JS_NewArrayBuffer(ctx, data->data, data->size, nullptr, nullptr, 0);
+  auto buf = JS_NewUInt8Array(ctx, array_buffer, 0, data->size);
+
+  auto global_obj = JS_GetGlobalObject(ctx);
+  auto res = JS_Call(ctx, resolve, global_obj, 1, (JSValueConst *)&buf);
+
+  JS_FreeValue(ctx, res);
+  JS_FreeValue(ctx, buf);
+  JS_FreeValue(ctx, array_buffer);
+  JS_FreeValue(ctx, global_obj);
+
+  return JS_UNDEFINED;
+}
+
+JSValue js_response_blob_job(JSContext *ctx, int argc, JSValueConst *argv) {
+  JSValue resolve, reject, response;
+
+  resolve = argv[0];
+  reject = argv[1];
+  response = argv[2];
+
+  auto *data = (response_data *)JS_GetOpaque(response, js_response_class_id);
+  if (data == nullptr) {
+    auto exception = throw_js_exception(ctx, "backing data is null");
+    reject_promise(ctx, reject, exception);
+    JS_FreeValue(ctx, exception);
+    return JS_UNDEFINED;
+  }
+
+  auto blob = new_blob(ctx, data->data, data->size);
+
+  auto global_obj = JS_GetGlobalObject(ctx);
+  auto res = JS_Call(ctx, resolve, global_obj, 1, (JSValueConst *)&blob);
+
+  JS_FreeValue(ctx, res);
+  JS_FreeValue(ctx, global_obj);
+  JS_FreeValue(ctx, blob);
+
+  return JS_UNDEFINED;
+}
+
+JSValue js_response_json(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
+  JSValue promise, resolving_funcs[2];
+  JSValueConst args[3];
+
+  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+  if (JS_IsException(promise)) {
+    return promise;
+  }
+
+  args[0] = resolving_funcs[0];
+  args[1] = resolving_funcs[1];
+  args[2] = this_val;
+
+  JS_EnqueueJob(ctx, js_response_json_job, 4, args);
+
+  JS_FreeValue(ctx, resolving_funcs[0]);
+  JS_FreeValue(ctx, resolving_funcs[1]);
+
+  return promise;
+}
+
+JSValue js_response_text(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
+  JSValue promise, resolving_funcs[2];
+  JSValueConst args[3];
+
+  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+  if (JS_IsException(promise)) {
+    return promise;
+  }
+
+  args[0] = resolving_funcs[0];
+  args[1] = resolving_funcs[1];
+  args[2] = this_val;
+
+  JS_EnqueueJob(ctx, js_response_text_job, 4, args);
+
+  JS_FreeValue(ctx, resolving_funcs[0]);
+  JS_FreeValue(ctx, resolving_funcs[1]);
+
+  return promise;
+}
+
+JSValue js_response_blob(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
+  JSValue promise, resolving_funcs[2];
+  JSValueConst args[3];
+
+  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+  if (JS_IsException(promise)) {
+    return promise;
+  }
+
+  args[0] = resolving_funcs[0];
+  args[1] = resolving_funcs[1];
+  args[2] = this_val;
+
+  JS_EnqueueJob(ctx, js_response_blob_job, 4, args);
+
+  JS_FreeValue(ctx, resolving_funcs[0]);
+  JS_FreeValue(ctx, resolving_funcs[1]);
+
+  return promise;
+}
+
+JSValue js_response_array_buffer(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
+  JSValue promise, resolving_funcs[2];
+  JSValueConst args[3];
+
+  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+  if (JS_IsException(promise)) {
+    return promise;
+  }
+
+  args[0] = resolving_funcs[0];
+  args[1] = resolving_funcs[1];
+  args[2] = this_val;
+
+  JS_EnqueueJob(ctx, js_response_array_buffer_job, 4, args);
+
+  JS_FreeValue(ctx, resolving_funcs[0]);
+  JS_FreeValue(ctx, resolving_funcs[1]);
+
+  return promise;
+}
+
+static void js_response_data_finalizer(JSRuntime *rt, JSValue val) {
+  auto *data = (response_data *)JS_GetOpaque(val, js_response_class_id);
+  if (data != nullptr) {
+    delete data;
+  }
+}
+
+static JSClassDef js_response_class = {"Response", .finalizer = js_response_data_finalizer};
+
+static const JSCFunctionListEntry js_response_proto_funcs[] = {
+    JS_CFUNC_DEF("json", 0, js_response_json),
+    JS_CFUNC_DEF("text", 0, js_response_text),
+    JS_CFUNC_DEF("arrayBuffer", 0, js_response_array_buffer),
+    JS_CFUNC_DEF("blob", 0, js_response_blob),
+};
+
+static JSValue api_response_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv) {
+  auto proto = JS_GetClassProto(ctx, js_response_class_id);
+  auto new_object = JS_NewObjectProtoClass(ctx, proto, js_response_class_id);
+
+  JS_FreeValue(ctx, proto);
+
+  return new_object;
+}
+
+JSValue new_js_response(JSContext *ctx, jobject j_response) {
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
+
+  auto j_ok = env->GetBooleanField(j_response, context->java->js_response_ok_field);
+  auto j_status = env->GetIntField(j_response, context->java->js_response_status_field);
+  auto *j_url = (jstring)env->GetObjectField(j_response, context->java->js_response_url_field);
+  auto *j_data = static_cast<jbyteArray>(env->GetObjectField(j_response, context->java->js_response_data_field));
+  auto *j_err = (jstring)env->GetObjectField(j_response, context->java->js_response_error_field);
+
+  const auto *c_url = env->GetStringUTFChars(j_url, nullptr);
+
+  auto response = api_response_constructor(ctx, JS_UNDEFINED, 0, nullptr);
+
+  JS_SetPropertyStr(ctx, response, "ok", JS_NewBool(ctx, (int)j_ok));
+  JS_SetPropertyStr(ctx, response, "status", JS_NewInt32(ctx, (int)j_status));
+  JS_SetPropertyStr(ctx, response, "url", JS_NewString(ctx, c_url));
+  JS_SetPropertyStr(ctx, response, "error", JS_NULL);
+
+  if (j_data != nullptr) {
+    auto j_data_len = env->GetArrayLength(j_data);
+    auto *j_data_arr = env->GetByteArrayElements(j_data, 0);
+
+    auto *buf = new uint8_t(j_data_len);
+
+    for (int i = 0; i < j_data_len; i++) {
+      buf[i] = j_data_arr[i];
+    }
+
+    env->ReleaseByteArrayElements(j_data, j_data_arr, 0);
+
+    // attach the array buffer to the js_response
+    auto *res_data = new response_data;
+    res_data->data = buf;
+    res_data->size = j_data_len;
+
+    JS_SetOpaque(response, res_data);
+  }
+
+  if (j_err != nullptr) {
+    const auto *c_err = env->GetStringUTFChars(j_err, nullptr);
+    JS_SetPropertyStr(ctx, response, "error", JS_NewString(ctx, c_err));
+    env->ReleaseStringUTFChars(j_err, c_err);
+  }
+
+  env->ReleaseStringUTFChars(j_url, c_url);
+
+  return response;
+}
+
+void init_response_class(JSContext *ctx) {
+  JSValue response_proto, obj;
+
+  JS_NewClassID(&js_response_class_id);
+  JS_NewClass(JS_GetRuntime(ctx), js_response_class_id, &js_response_class);
+
+  response_proto = JS_NewObject(ctx);
+
+  JS_SetPropertyFunctionList(ctx, response_proto, js_response_proto_funcs, countof(js_response_proto_funcs));
+  JS_SetClassProto(ctx, js_response_class_id, response_proto);
+
+  obj = JS_NewCFunction2(ctx, api_response_constructor, "Response", 1, JS_CFUNC_constructor, 1);
+
+  auto global_obj = JS_GetGlobalObject(ctx);
+  JS_SetPropertyStr(ctx, global_obj, "Response", obj);
+  JS_FreeValue(ctx, global_obj);
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.h
new file mode 100644
index 0000000..47767e8
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_js_response.h
@@ -0,0 +1,11 @@
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_JS_RESPONSE_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_JS_RESPONSE_H
+
+#include "../quickjs/quickjs.h"
+#include <jni.h>
+#include "api_blob.h"
+
+void init_response_class(JSContext *ctx);
+JSValue new_js_response(JSContext *ctx, jobject j_response);
+
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_JS_RESPONSE_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_text.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_text.cpp
new file mode 100644
index 0000000..dcb9f56
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_text.cpp
@@ -0,0 +1,191 @@
+#include "api_text.h"
+
+#include "../context.h"
+#include "../errors.h"
+#include "../quickjs/cutils.h"
+
+static JSClassID js_text_encoder_class_id;
+static JSClassID js_text_decoder_class_id;
+
+static JSClassDef js_text_encoder_class = {
+    "TextEncoder",
+};
+
+static JSClassDef js_text_decoder_class = {
+    "TextDecoder",
+};
+
+static JSValue api_text_encoder_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv) {
+  JSValue const proto = JS_GetClassProto(ctx, js_text_encoder_class_id);
+
+  auto new_object_class = JS_NewObjectProtoClass(ctx, proto, js_text_encoder_class_id);
+
+  JS_FreeValue(ctx, proto);
+
+  return new_object_class;
+}
+
+static JSValue api_text_decoder_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv) {
+  JSValue const proto = JS_GetClassProto(ctx, js_text_decoder_class_id);
+
+  auto new_object_class = JS_NewObjectProtoClass(ctx, proto, js_text_decoder_class_id);
+
+  JS_FreeValue(ctx, proto);
+
+  if (JS_IsException(new_object_class)) {
+    return new_object_class;
+  }
+
+  JS_SetPropertyStr(ctx, new_object_class, "label", JS_NewString(ctx, "utf-8"));
+
+  if (argc == 1) {
+    if (JS_IsString(argv[0])) {
+      JS_SetPropertyStr(ctx, new_object_class, "label", argv[0]);
+    }
+  }
+
+  return new_object_class;
+}
+
+static JSValue api_text_encoder_encode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  uint8_t *buf;
+
+  if (!JS_IsString(argv[0])) {
+    return JS_EXCEPTION;
+  }
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
+
+  const auto *c_str = JS_ToCString(ctx, argv[0]);
+  jstring j_string = env->NewStringUTF(c_str);
+
+  auto *byte_array = static_cast<jbyteArray>(env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_stringToByteArray_method, j_string));
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    JS_FreeCString(ctx, c_str);
+    return exception;
+  }
+
+  auto length = env->GetArrayLength(byte_array);
+  auto arr = env->GetByteArrayElements(byte_array, 0);
+  buf = new uint8_t(length);
+
+  for (int i = 0; i < length; i++) {
+    buf[i] = arr[i];
+  }
+
+  auto array_buffer = JS_NewArrayBuffer(ctx, buf, length, nullptr, nullptr, 0);
+  auto ret_value = JS_NewUInt8Array(ctx, array_buffer, 0, length);
+
+  env->ReleaseByteArrayElements(byte_array, arr, 0);
+  JS_FreeCString(ctx, c_str);
+  JS_FreeValue(ctx, array_buffer);
+
+  return ret_value;
+}
+
+static JSValue api_text_decoder_decode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  uint8_t *buf;
+  size_t elem, len, offset, buf_size;
+  int size;
+
+  auto t_arr_buf = JS_GetTypedArrayBuffer(ctx, argv[0], &offset, &len, &elem);
+  buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr_buf);
+
+  if (!buf) {
+    JS_FreeValue(ctx, t_arr_buf);
+    return JS_EXCEPTION;
+  }
+
+  size = buf_size;
+
+  JS_FreeValue(ctx, t_arr_buf);
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
+
+  auto label_prop_str = JS_GetPropertyStr(ctx, this_val, "label");
+  const auto *encoding = JS_ToCString(ctx, label_prop_str);
+
+  auto *j_encoding = env->NewStringUTF(encoding);
+
+  jbyteArray byte_array = env->NewByteArray(size);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    JS_FreeCString(ctx, encoding);
+    return exception;
+  }
+
+  env->SetByteArrayRegion(byte_array, 0, size, reinterpret_cast<const jbyte *>(buf));
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    JS_FreeCString(ctx, encoding);
+    return exception;
+  }
+
+  auto *str = (jstring)env->CallStaticObjectMethod(context->java->web_api_class, context->java->web_api_byteArrayToString_method, byte_array, j_encoding);
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    JS_FreeCString(ctx, encoding);
+    return exception;
+  }
+
+  const char *c_str = env->GetStringUTFChars(str, nullptr);
+
+  auto ret_value = JS_NewString(ctx, c_str);
+
+  env->ReleaseStringUTFChars(str, c_str);
+
+  JS_FreeCString(ctx, encoding);
+
+  return ret_value;
+}
+
+static const JSCFunctionListEntry js_text_encoder_proto_funcs[] = {
+    JS_CFUNC_DEF("encode", 1, api_text_encoder_encode),
+};
+
+static const JSCFunctionListEntry js_text_decoder_proto_funcs[] = {
+    JS_CFUNC_DEF("decode", 1, api_text_decoder_decode),
+};
+
+void init_text_encoder_class(JSContext *ctx) {
+  JSValue text_encoder_proto, obj;
+
+  JS_NewClassID(&js_text_encoder_class_id);
+  JS_NewClass(JS_GetRuntime(ctx), js_text_encoder_class_id, &js_text_encoder_class);
+  text_encoder_proto = JS_NewObject(ctx);
+  JS_SetPropertyFunctionList(ctx, text_encoder_proto, js_text_encoder_proto_funcs, countof(js_text_encoder_proto_funcs));
+  JS_SetClassProto(ctx, js_text_encoder_class_id, text_encoder_proto);
+
+  obj = JS_NewCFunction2(ctx, api_text_encoder_constructor, "TextEncoder", 0, JS_CFUNC_constructor, 0);
+
+  JSValue global_obj = JS_GetGlobalObject(ctx);
+  JS_SetPropertyStr(ctx, global_obj, "TextEncoder", obj);
+  JS_FreeValue(ctx, global_obj);
+}
+
+void init_text_decoder_class(JSContext *ctx) {
+  JSValue text_decoder_proto, obj;
+
+  JS_NewClassID(&js_text_decoder_class_id);
+  JS_NewClass(JS_GetRuntime(ctx), js_text_decoder_class_id, &js_text_decoder_class);
+  text_decoder_proto = JS_NewObject(ctx);
+  JS_SetPropertyFunctionList(ctx, text_decoder_proto, js_text_decoder_proto_funcs, countof(js_text_decoder_proto_funcs));
+  JS_SetClassProto(ctx, js_text_decoder_class_id, text_decoder_proto);
+
+  obj = JS_NewCFunction2(ctx, api_text_decoder_constructor, "TextDecoder", 0, JS_CFUNC_constructor, 0);
+
+  JSValue global_obj = JS_GetGlobalObject(ctx);
+  JS_SetPropertyStr(ctx, global_obj, "TextDecoder", obj);
+  JS_FreeValue(ctx, global_obj);
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api/api_text.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_text.h
new file mode 100644
index 0000000..64d4586
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_text.h
@@ -0,0 +1,9 @@
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_TEXT_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_TEXT_H
+
+#include "../quickjs/quickjs.h"
+
+void init_text_encoder_class(JSContext *ctx);
+void init_text_decoder_class(JSContext *ctx);
+
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_TEXT_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_timeout.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api/api_timeout.cpp
similarity index 56%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_timeout.cpp
rename to packages/android-engine/android-js-engine/src/main/cpp/api/api_timeout.cpp
index 3a0db0d..11c8741 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_timeout.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_timeout.cpp
@@ -1,13 +1,10 @@
 #include "api_timeout.h"
 
-#include "context.h"
-#include "errors.h"
+#include "../context.h"
+#include "../errors.h"
 
 JSValue create_timer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, bool repeat) {
   JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  int timeout;
 
   if (!JS_IsNumber(argv[1])) {
     return JS_EXCEPTION;
@@ -17,17 +14,19 @@ JSValue create_timer(JSContext *ctx, JSValueConst this_val, int argc, JSValueCon
     return JS_EXCEPTION;
   }
 
-  timeout = JS_VALUE_GET_INT(argv[1]);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
+  int const timeout = JS_VALUE_GET_INT(argv[1]);
 
-  auto *env = parent_ctx->getJNIEnv();
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
 
-  int unique = env->CallIntMethod(parent_ctx->api, parent_ctx->jni_classes->context_api_randomHashCode_method);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    return throw_js_exception(ctx, "JVM Environment is null");
+  }
 
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
+  int const unique = env->CallStaticIntMethod(context->java->web_api_class, context->java->web_api_randomHashCode_method);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
   }
 
   Timer timer{};
@@ -37,11 +36,7 @@ JSValue create_timer(JSContext *ctx, JSValueConst this_val, int argc, JSValueCon
   timer.start = std::chrono::system_clock::now();
   timer.repeat = repeat;
 
-  parent_ctx->timers_mutex.lock();
-
-  parent_ctx->timers[unique] = timer;
-
-  parent_ctx->timers_mutex.unlock();
+  context->timers[unique] = timer;
 
   ret_value = JS_NewInt32(ctx, unique);
 
@@ -59,16 +54,12 @@ JSValue api_clear_timeout(JSContext *ctx, JSValueConst this_val, int argc, JSVal
     return JS_EXCEPTION;
   }
 
-  int id = JS_VALUE_GET_INT(argv[0]);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-
-  parent_ctx->timers_mutex.lock();
+  int const id = JS_VALUE_GET_INT(argv[0]);
 
-  JS_FreeValue(ctx, parent_ctx->timers[id].js_func);
-  parent_ctx->timers.erase(id);
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
 
-  parent_ctx->timers_mutex.unlock();
+  JS_FreeValue(ctx, context->timers[id].js_func);
+  context->timers.erase(id);
 
   return ret_value;
 }
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_timeout.h b/packages/android-engine/android-js-engine/src/main/cpp/api/api_timeout.h
similarity index 70%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_timeout.h
rename to packages/android-engine/android-js-engine/src/main/cpp/api/api_timeout.h
index b273de5..577d161 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_timeout.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/api/api_timeout.h
@@ -1,8 +1,8 @@
-#include <chrono>
-#include "quickjs/quickjs.h"
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_TIMEOUT_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_TIMEOUT_H
 
-#ifndef ANDROID_ENGINE_API_TIMEOUT_H
-#define ANDROID_ENGINE_API_TIMEOUT_H
+#include <chrono>
+#include "../quickjs/quickjs.h"
 
 struct Timer {
     int timeout;
@@ -15,4 +15,4 @@ JSValue api_set_timeout(JSContext *ctx, JSValueConst this_val, int argc, JSValue
 JSValue api_clear_timeout(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 JSValue api_set_interval(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 
-#endif //ANDROID_ENGINE_API_TIMEOUT_H
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_TIMEOUT_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_crypto.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_crypto.cpp
deleted file mode 100644
index 72b9754..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_crypto.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "api_crypto.h"
-
-#include "context.h"
-#include "errors.h"
-
-JSValue api_crypto_get_random_values(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  uint8_t *buf;
-  size_t elem, len, offset, buf_size;
-  int size;
-
-  JSValue t_arr = JS_GetTypedArrayBuffer(ctx, argv[0], &offset, &len, &elem);
-
-  size = len;
-
-  buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr);
-
-  if (!buf) {
-    return JS_EXCEPTION;
-  }
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-
-  jclass j_context_api_class = parent_ctx->env->FindClass("io/ionic/android_js_engine/ContextAPI");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  jmethodID j_method = parent_ctx->env->GetMethodID(j_context_api_class, "cryptoGetRandom", "(I)[B");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto random_bytes = static_cast<jbyteArray>(parent_ctx->env->CallObjectMethod(parent_ctx->api, j_method, size));
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto random = parent_ctx->env->GetByteArrayElements(random_bytes, nullptr);
-
-  for (int i = 0; i < size; i++) {
-    buf[i] = random[i];
-  }
-
-  parent_ctx->env->ReleaseByteArrayElements(random_bytes, random, 0);
-
-  JS_FreeValue(ctx, t_arr);
-
-  ret_value = JS_DupValue(ctx, argv[0]);
-
-  return ret_value;
-}
-
-JSValue api_crypto_random_uuid(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-
-  jclass j_context_api_class = parent_ctx->env->FindClass("io/ionic/android_js_engine/ContextAPI");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  jmethodID j_method = parent_ctx->env->GetMethodID(j_context_api_class, "cryptoRandomUUID", "()Ljava/lang/String;");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto str = (jstring)parent_ctx->env->CallObjectMethod(parent_ctx->api, j_method);
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto c_str = parent_ctx->env->GetStringUTFChars(str, nullptr);
-
-  ret_value = JS_NewString(ctx, c_str);
-
-  parent_ctx->env->ReleaseStringUTFChars(str, c_str);
-
-  return ret_value;
-}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_device.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_device.cpp
deleted file mode 100644
index c8257dd..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_device.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "api_device.h"
-
-#include "context.h"
-#include "errors.h"
-
-JSValue api_device_battery(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value, jni_exception = JS_UNDEFINED;
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto *device = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_device_field);
-
-  jmethodID j_device_battery_method = env->GetMethodID(parent_ctx->jni_classes->device_api_class, "getBatteryStatus", "()Ljava/lang/String;");
-
-  auto *j_json_str = (jstring)env->CallObjectMethod(device, j_device_battery_method);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  if (j_json_str == nullptr) {
-    return JS_NULL;
-  }
-
-  const auto *c_json_str = env->GetStringUTFChars(j_json_str, nullptr);
-
-  ret_value = parent_ctx->parseJSON(c_json_str);
-
-  env->ReleaseStringUTFChars(j_json_str, c_json_str);
-
-  return ret_value;
-}
-
-JSValue api_device_network(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value, jni_exception = JS_UNDEFINED;
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto *device = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_device_field);
-
-  jmethodID j_device_network_method = env->GetMethodID(parent_ctx->jni_classes->device_api_class, "getNetworkStatus", "()Ljava/lang/String;");
-
-  auto *j_json_str = (jstring)env->CallObjectMethod(device, j_device_network_method);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  if (j_json_str == nullptr) {
-    return JS_NULL;
-  }
-
-  const auto *c_json_str = env->GetStringUTFChars(j_json_str, nullptr);
-
-  ret_value = parent_ctx->parseJSON(c_json_str);
-
-  env->ReleaseStringUTFChars(j_json_str, c_json_str);
-
-  return ret_value;
-}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_events.h b/packages/android-engine/android-js-engine/src/main/cpp/api_events.h
deleted file mode 100644
index 6572945..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_events.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "quickjs/quickjs.h"
-
-#ifndef ANDROID_ENGINE_API_EVENTS_H
-#define ANDROID_ENGINE_API_EVENTS_H
-
-JSValue api_add_event_listener(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
-
-#endif //ANDROID_ENGINE_API_EVENTS_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_fetch.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_fetch.cpp
deleted file mode 100644
index af5806d..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_fetch.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-#include "api_fetch.h"
-
-#include <android/log.h>
-
-#include <chrono>
-#include <future>
-#include <thread>
-
-#include "context.h"
-#include "errors.h"
-
-JSValue js_response_json_job(JSContext *ctx, int argc, JSValueConst *argv) {
-  JSValue resolve, reject, data;
-
-  resolve = argv[0];
-  reject = argv[1];
-  data = argv[2];
-
-  uint8_t *buf;
-  size_t elem, len, offset, buf_size;
-  int size;
-
-  JSValue t_arr = JS_GetTypedArrayBuffer(ctx, data, &offset, &len, &elem);
-
-  size = len;
-
-  buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  jstring encoding = env->NewStringUTF("utf-8");
-  jbyteArray j_byte_array = env->NewByteArray(size);
-
-  env->SetByteArrayRegion(j_byte_array, 0, size, reinterpret_cast<const jbyte *>(buf));
-
-  auto *json_string = (jstring)env->CallObjectMethod(parent_ctx->api, parent_ctx->jni_classes->context_api_byteArrayToString_method, j_byte_array, encoding);
-
-  const char *json_c_string = env->GetStringUTFChars(json_string, nullptr);
-
-  JSValue json = parent_ctx->parseJSON(std::string(json_c_string));
-
-  JSValue global_obj = JS_GetGlobalObject(ctx);
-  JS_FreeValue(ctx, JS_Call(ctx, resolve, global_obj, 1, (JSValueConst *)&json));
-  JS_FreeValue(ctx, global_obj);
-  JS_FreeValue(ctx, t_arr);
-  JS_FreeValue(ctx, json);
-
-  env->ReleaseStringUTFChars(json_string, json_c_string);
-
-  return JS_UNDEFINED;
-}
-
-JSValue js_response_json_promise(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
-  JSValue promise, resolving_funcs[2];
-  JSValueConst args[3];
-
-  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
-  if (JS_IsException(promise)) {
-    JS_Throw(ctx, promise);
-    return JS_UNDEFINED;
-  }
-
-  JSValue data = JS_GetPropertyStr(ctx, this_val, "_data");
-
-  args[0] = resolving_funcs[0];
-  args[1] = resolving_funcs[1];
-  args[2] = data;
-
-  JS_EnqueueJob(ctx, js_response_json_job, 4, args);
-
-  JS_FreeValue(ctx, resolving_funcs[0]);
-  JS_FreeValue(ctx, resolving_funcs[1]);
-  JS_FreeValue(ctx, data);
-
-  return promise;
-}
-
-JSValue js_response_to_value(JSContext *ctx, jobject response) {
-  int flags = JS_EVAL_TYPE_GLOBAL | JS_EVAL_FLAG_BACKTRACE_BARRIER;
-  uint8_t *buf;
-  size_t elem, len, offset, buf_size;
-
-  JSValue jni_exception, js_response;
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto env = parent_ctx->getJNIEnv();
-
-  if (env == nullptr) {
-    return JS_UNDEFINED;
-  }
-
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto j_ok = env->GetBooleanField(response, parent_ctx->jni_classes->js_response_ok_field);
-  auto j_status = env->GetIntField(response, parent_ctx->jni_classes->js_response_status_field);
-  auto *j_url = (jstring)env->GetObjectField(response, parent_ctx->jni_classes->js_response_url_field);
-  auto *j_data = static_cast<jbyteArray>(env->GetObjectField(response, parent_ctx->jni_classes->js_response_data_field));
-  auto *j_err = (jstring)env->GetObjectField(response, parent_ctx->jni_classes->js_response_error_field);
-
-  const auto *c_url = env->GetStringUTFChars(j_url, nullptr);
-
-  js_response = JS_NewObject(ctx);
-  JS_SetPropertyStr(ctx, js_response, "ok", JS_NewBool(ctx, (int)j_ok));
-  JS_SetPropertyStr(ctx, js_response, "status", JS_NewInt32(ctx, (int)j_status));
-  JS_SetPropertyStr(ctx, js_response, "url", JS_NewString(ctx, c_url));
-
-  if (j_data != nullptr) {
-    auto j_data_len = env->GetArrayLength(j_data);
-    auto *j_data_arr = env->GetByteArrayElements(j_data, 0);
-
-    std::string new_uint8arr_code = "new Uint8Array(" + std::to_string(j_data_len) + ")";
-    JSValue uint8arr = JS_Eval(ctx, new_uint8arr_code.c_str(), new_uint8arr_code.length(), "<internal>", flags);
-
-    JSValue t_arr = JS_GetTypedArrayBuffer(ctx, uint8arr, &offset, &len, &elem);
-
-    buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr);
-
-    for (int i = 0; i < len; i++) {
-      buf[i] = j_data_arr[i];
-    }
-
-    JS_SetPropertyStr(ctx, js_response, "_data", JS_DupValue(ctx, uint8arr));
-
-    env->ReleaseByteArrayElements(j_data, j_data_arr, 0);
-    JS_FreeValue(ctx, t_arr);
-    JS_FreeValue(ctx, uint8arr);
-  } else {
-    JS_SetPropertyStr(ctx, js_response, "_data", JS_NULL);
-  }
-
-  if (j_err != nullptr) {
-    const auto *c_err = env->GetStringUTFChars(j_err, nullptr);
-    JS_SetPropertyStr(ctx, js_response, "error", JS_NewString(ctx, c_err));
-    env->ReleaseStringUTFChars(j_err, c_err);
-  } else {
-    JS_SetPropertyStr(ctx, js_response, "error", JS_NULL);
-  }
-
-  env->ReleaseStringUTFChars(j_url, c_url);
-
-  JS_SetPropertyStr(ctx, js_response, "json", JS_NewCFunction(ctx, js_response_json_promise, "json", 0));
-
-  return js_response;
-}
-
-JSValue js_fetch_job(JSContext *ctx, int argc, JSValueConst *argv) {
-  JSValue resolve, reject, request, options;
-  JSValue jni_exception;
-
-  resolve = argv[0];
-  reject = argv[1];
-  request = argv[2];
-  options = argv[3];
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-
-  auto *env = parent_ctx->getJNIEnv();
-
-  JSValue global_obj = JS_GetGlobalObject(ctx);
-
-  if (JS_IsNull(request) || !JS_IsString(request)) {
-    JSValue error = JS_NewError(ctx);
-    JS_SetPropertyStr(ctx, error, "message", JS_NewString(ctx, "invalid url"));
-
-    JS_Call(ctx, reject, global_obj, 1, (JSValueConst *)&jni_exception);
-    JS_FreeValue(ctx, global_obj);
-    JS_FreeValue(ctx, error);
-    parent_ctx->vm->DetachCurrentThread();
-
-    return JS_UNDEFINED;
-  }
-
-  auto c_url_str = JS_ToCString(ctx, request);
-
-  auto j_url_str = env->NewStringUTF(c_url_str);
-
-  jobject j_options = nullptr;
-
-  if (!JS_IsNull(options) && !JS_IsUndefined(options)) {
-    auto options_json = parent_ctx->stringifyJSON(options);
-    auto j_options_json = env->NewStringUTF(options_json.c_str());
-
-    j_options = env->NewObject(parent_ctx->jni_classes->js_fetch_options_class, parent_ctx->jni_classes->js_fetch_options_constructor, j_options_json);
-
-    jni_exception = check_and_throw_jni_exception(env, ctx);
-    if (JS_IsException(jni_exception)) {
-      JS_Call(ctx, reject, global_obj, 1, (JSValueConst *)&jni_exception);
-      JS_FreeValue(ctx, global_obj);
-      env->DeleteLocalRef(j_options_json);
-
-      parent_ctx->vm->DetachCurrentThread();
-
-      return JS_UNDEFINED;
-    }
-
-    env->DeleteLocalRef(j_options_json);
-  }
-
-  auto response = env->CallObjectMethod(parent_ctx->api, parent_ctx->jni_classes->context_api_fetch_method, j_url_str, j_options);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-  if (JS_IsException(jni_exception)) {
-    JS_Call(ctx, reject, global_obj, 1, (JSValueConst *)&jni_exception);
-    JS_FreeValue(ctx, global_obj);
-
-    parent_ctx->vm->DetachCurrentThread();
-
-    return JS_UNDEFINED;
-  }
-
-  auto res = js_response_to_value(ctx, response);
-
-  JSValue err = JS_GetPropertyStr(ctx, res, "error");
-  if (JS_IsString(err)) {
-    JS_Call(ctx, reject, global_obj, 1, (JSValueConst *)&err);
-    JS_FreeValue(ctx, global_obj);
-    JS_FreeValue(ctx, res);
-    JS_FreeValue(ctx, err);
-    return JS_UNDEFINED;
-  }
-
-  JS_Call(ctx, resolve, global_obj, 1, (JSValueConst *)&res);
-
-  JS_FreeValue(ctx, global_obj);
-  JS_FreeValue(ctx, res);
-  JS_FreeValue(ctx, err);
-
-  parent_ctx->vm->DetachCurrentThread();
-
-  return JS_UNDEFINED;
-}
-
-JSValue api_fetch_promise(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv) {
-  JSValue promise, resolving_funcs[2];
-  JSValueConst args[4];
-
-  promise = JS_NewPromiseCapability(ctx, resolving_funcs);
-  if (JS_IsException(promise)) {
-    JS_Throw(ctx, promise);
-    return JS_UNDEFINED;
-  }
-
-  args[0] = resolving_funcs[0];
-  args[1] = resolving_funcs[1];
-  args[2] = argv[0];
-  args[3] = argv[1];
-
-  JS_EnqueueJob(ctx, js_fetch_job, 4, args);
-
-  JS_FreeValue(ctx, resolving_funcs[0]);
-  JS_FreeValue(ctx, resolving_funcs[1]);
-
-  return promise;
-}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_fetch.h b/packages/android-engine/android-js-engine/src/main/cpp/api_fetch.h
deleted file mode 100644
index 955113f..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_fetch.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <jni.h>
-#include "quickjs/quickjs.h"
-
-#ifndef CAPACITOR_BACKGROUND_RUNNER_API_FETCH_H
-#define CAPACITOR_BACKGROUND_RUNNER_API_FETCH_H
-
-struct FetchPromise {
-    JSValue resolve;
-    JSValue reject;
-    JSValue request;
-    JSValue options;
-};
-
-JSValue js_response_to_value(JSContext *ctx, jobject response);
-JSValue api_fetch_promise(JSContext *ctx, JSValueConst this_val, int argc, JSValue *argv);
-void api_fetch(JSContext *ctx, FetchPromise promise);
-
-#endif //CAPACITOR_BACKGROUND_RUNNER_API_FETCH_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.cpp
deleted file mode 100644
index 566e2c4..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "api_geolocation.h"
-
-#include "context.h"
-#include "errors.h"
-
-JSValue api_geolocation_current_location(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value, jni_exception = JS_UNDEFINED;
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto *geolocation = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_geolocation_field);
-
-  jmethodID j_geolocation_current_location_method = env->GetMethodID(parent_ctx->jni_classes->geolocation_api_class, "getCurrentPosition", "()Ljava/lang/String;");
-
-  auto value_j_str = (jstring)env->CallObjectMethod(geolocation, j_geolocation_current_location_method);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  if (value_j_str == nullptr) {
-    return JS_NULL;
-  }
-
-  auto value_c_str = env->GetStringUTFChars(value_j_str, nullptr);
-
-  ret_value = parent_ctx->parseJSON(value_c_str);
-
-  env->ReleaseStringUTFChars(value_j_str, value_c_str);
-
-  return ret_value;
-}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.h b/packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.h
deleted file mode 100644
index 79822f6..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_geolocation.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CAPACITOR_BACKGROUND_RUNNER_API_GEOLOCATION_H
-#define CAPACITOR_BACKGROUND_RUNNER_API_GEOLOCATION_H
-
-#include "quickjs/quickjs.h"
-
-JSValue api_geolocation_current_location(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
-
-#endif //CAPACITOR_BACKGROUND_RUNNER_API_GEOLOCATION_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_kv.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_kv.cpp
deleted file mode 100644
index a8ee9dc..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_kv.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "api_kv.h"
-
-#include "context.h"
-#include "errors.h"
-
-JSValue api_kv_set(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  const auto *key_c_str = JS_ToCString(ctx, argv[0]);
-  const auto *value_c_str = JS_ToCString(ctx, argv[1]);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto *kv = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_kv_field);
-
-  jmethodID j_kv_set_method = env->GetMethodID(parent_ctx->jni_classes->kv_api_class, "set", "(Ljava/lang/String;Ljava/lang/String;)V");
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  jstring key_j_str = env->NewStringUTF(key_c_str);
-  jstring value_j_str = env->NewStringUTF(value_c_str);
-
-  env->CallVoidMethod(kv, j_kv_set_method, key_j_str, value_j_str);
-
-  JS_FreeCString(ctx, key_c_str);
-  JS_FreeCString(ctx, value_c_str);
-
-  return ret_value;
-}
-
-JSValue api_kv_get(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  const auto *key_c_str = JS_ToCString(ctx, argv[0]);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto *kv = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_kv_field);
-
-  jmethodID j_kv_get_method = env->GetMethodID(parent_ctx->jni_classes->kv_api_class, "get", "(Ljava/lang/String;)Ljava/lang/String;");
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    JS_FreeCString(ctx, key_c_str);
-    return jni_exception;
-  }
-
-  jstring key_j_str = env->NewStringUTF(key_c_str);
-
-  auto value_j_str = (jstring)env->CallObjectMethod(kv, j_kv_get_method, key_j_str);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    JS_FreeCString(ctx, key_c_str);
-    return jni_exception;
-  }
-
-  if (value_j_str == nullptr) {
-    JS_FreeCString(ctx, key_c_str);
-    return JS_NULL;
-  }
-
-  auto value_c_str = env->GetStringUTFChars(value_j_str, nullptr);
-  auto value_str_obj = JS_NewString(ctx, value_c_str);
-
-  ret_value = JS_NewObject(ctx);
-  JS_SetPropertyStr(ctx, ret_value, "value", value_str_obj);
-
-  env->ReleaseStringUTFChars(value_j_str, value_c_str);
-  JS_FreeCString(ctx, key_c_str);
-
-  return ret_value;
-}
-
-JSValue api_kv_remove(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  const auto *key_c_str = JS_ToCString(ctx, argv[0]);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto *kv = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_kv_field);
-
-  jmethodID j_kv_remove_method = env->GetMethodID(parent_ctx->jni_classes->kv_api_class, "remove", "(Ljava/lang/String;)V");
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    JS_FreeCString(ctx, key_c_str);
-    return jni_exception;
-  }
-
-  jstring key_j_str = env->NewStringUTF(key_c_str);
-
-  env->CallVoidMethod(kv, j_kv_remove_method, key_j_str);
-
-  JS_FreeCString(ctx, key_c_str);
-
-  return ret_value;
-}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_notifications.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_notifications.cpp
deleted file mode 100644
index 6b26f76..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_notifications.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "api_notifications.h"
-
-#include "context.h"
-#include "errors.h"
-
-JSValue api_notifications_schedule(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue jni_exception = JS_UNDEFINED;
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-  auto *env = parent_ctx->getJNIEnv();
-
-  auto options_json = parent_ctx->stringifyJSON(argv[0]);
-
-  auto *notifications = env->GetObjectField(parent_ctx->capacitor_api, parent_ctx->jni_classes->capacitor_api_notification_field);
-  jmethodID j_notification_schedule_method = env->GetMethodID(parent_ctx->jni_classes->notification_api_class, "schedule", "(Ljava/lang/String;)V");
-
-  jstring j_options_json = env->NewStringUTF(options_json.c_str());
-
-  env->CallVoidMethod(notifications, j_notification_schedule_method, j_options_json);
-  jni_exception = check_and_throw_jni_exception(env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  return JS_UNDEFINED;
-}
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_notifications.h b/packages/android-engine/android-js-engine/src/main/cpp/api_notifications.h
deleted file mode 100644
index 60b008f..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_notifications.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CAPACITOR_BACKGROUND_RUNNER_API_NOTIFICATIONS_H
-#define CAPACITOR_BACKGROUND_RUNNER_API_NOTIFICATIONS_H
-
-#include "quickjs/quickjs.h"
-
-JSValue api_notifications_schedule(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
-
-#endif //CAPACITOR_BACKGROUND_RUNNER_API_NOTIFICATIONS_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_text.cpp b/packages/android-engine/android-js-engine/src/main/cpp/api_text.cpp
deleted file mode 100644
index bed91f0..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_text.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-#include "api_text.h"
-
-#include "context.h"
-#include "errors.h"
-#include "quickjs/cutils.h"
-
-static JSClassID js_text_encoder_class_id;
-static JSClassID js_text_decoder_class_id;
-
-static JSClassDef js_text_encoder_class = {
-    "TextEncoder",
-};
-
-static JSClassDef js_text_decoder_class = {
-    "TextDecoder",
-};
-
-static JSValue api_text_encoder_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue proto = JS_GetClassProto(ctx, js_text_encoder_class_id);
-
-  ret_value = JS_NewObjectProtoClass(ctx, proto, js_text_encoder_class_id);
-
-  JS_FreeValue(ctx, proto);
-  if (JS_IsException(ret_value)) {
-    JS_FreeValue(ctx, ret_value);
-    return JS_EXCEPTION;
-  }
-
-  return ret_value;
-}
-
-static JSValue api_text_decoder_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue proto = JS_GetClassProto(ctx, js_text_decoder_class_id);
-
-  ret_value = JS_NewObjectProtoClass(ctx, proto, js_text_decoder_class_id);
-
-  JS_FreeValue(ctx, proto);
-
-  if (JS_IsException(ret_value)) {
-    JS_FreeValue(ctx, ret_value);
-    return JS_EXCEPTION;
-  }
-
-  JS_SetPropertyStr(ctx, ret_value, "label", JS_NewString(ctx, "utf-8"));
-
-  if (argc == 1) {
-    if (JS_IsString(argv[0])) {
-      JS_SetPropertyStr(ctx, ret_value, "label", argv[0]);
-    }
-  }
-
-  return ret_value;
-}
-
-static JSValue api_text_encoder_encode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
-
-  uint8_t *buf;
-  size_t elem, len, offset, buf_size;
-  int flags = JS_EVAL_TYPE_GLOBAL | JS_EVAL_FLAG_BACKTRACE_BARRIER;
-
-  if (!JS_IsString(argv[0])) {
-    return JS_EXCEPTION;
-  }
-
-  auto c_str = JS_ToCString(ctx, argv[0]);
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-
-  jclass j_context_api_class = parent_ctx->env->FindClass("io/ionic/android_js_engine/ContextAPI");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  jmethodID j_method = parent_ctx->env->GetMethodID(j_context_api_class, "stringToByteArray", "(Ljava/lang/String;)[B");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  jstring j_string = parent_ctx->env->NewStringUTF(c_str);
-
-  auto byte_array = static_cast<jbyteArray>(parent_ctx->env->CallObjectMethod(parent_ctx->api, j_method, j_string));
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto length = parent_ctx->env->GetArrayLength(byte_array);
-  auto arr = parent_ctx->env->GetByteArrayElements(byte_array, 0);
-
-  std::string new_uint8arr_code = "new Uint8Array(" + std::to_string(length) + ")";
-
-  JSValue uint8arr = JS_Eval(ctx, new_uint8arr_code.c_str(), new_uint8arr_code.length(), "<internal>", flags);
-
-  JSValue t_arr = JS_GetTypedArrayBuffer(ctx, uint8arr, &offset, &len, &elem);
-
-  buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr);
-
-  if (!buf) {
-    return JS_EXCEPTION;
-  }
-
-  for (int i = 0; i < len; i++) {
-    buf[i] = arr[i];
-  }
-
-  ret_value = JS_DupValue(ctx, uint8arr);
-
-  parent_ctx->env->ReleaseByteArrayElements(byte_array, arr, 0);
-
-  JS_FreeValue(ctx, t_arr);
-  JS_FreeValue(ctx, uint8arr);
-  JS_FreeCString(ctx, c_str);
-
-  return ret_value;
-}
-
-static JSValue api_text_decoder_decode(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception = JS_NULL;
-
-  uint8_t *buf;
-  size_t elem, len, offset, buf_size;
-  int size;
-
-  JSValue t_arr = JS_GetTypedArrayBuffer(ctx, argv[0], &offset, &len, &elem);
-
-  size = len;
-
-  buf = JS_GetArrayBuffer(ctx, &buf_size, t_arr);
-
-  if (!buf) {
-    return JS_EXCEPTION;
-  }
-
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
-
-  jclass j_context_api_class = parent_ctx->env->FindClass("io/ionic/android_js_engine/ContextAPI");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  jmethodID j_method = parent_ctx->env->GetMethodID(j_context_api_class, "byteArrayToString", "([BLjava/lang/String;)Ljava/lang/String;");
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto labelPropStr = JS_GetPropertyStr(ctx, this_val, "label");
-  auto encoding = JS_ToCString(ctx, labelPropStr);
-  jstring j_encoding = parent_ctx->env->NewStringUTF(encoding);
-
-  jbyteArray byte_array = parent_ctx->env->NewByteArray(size);
-
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  parent_ctx->env->SetByteArrayRegion(byte_array, 0, size, reinterpret_cast<const jbyte *>(buf));
-
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  auto str = (jstring)parent_ctx->env->CallObjectMethod(parent_ctx->api, j_method, byte_array, j_encoding);
-  jni_exception = check_and_throw_jni_exception(parent_ctx->env, ctx);
-
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
-
-  const char *c_str = parent_ctx->env->GetStringUTFChars(str, nullptr);
-
-  ret_value = JS_NewString(ctx, c_str);
-
-  parent_ctx->env->ReleaseStringUTFChars(str, c_str);
-  JS_FreeCString(ctx, encoding);
-  JS_FreeValue(ctx, t_arr);
-
-  return ret_value;
-}
-
-static const JSCFunctionListEntry js_text_encoder_proto_funcs[] = {
-    JS_CFUNC_DEF("encode", 1, api_text_encoder_encode),
-};
-
-static const JSCFunctionListEntry js_text_decoder_proto_funcs[] = {
-    JS_CFUNC_DEF("decode", 1, api_text_decoder_decode),
-};
-
-void init_text_decoder_class(JSContext *ctx) {
-  JSValue text_decoder_proto, obj;
-
-  JS_NewClassID(&js_text_decoder_class_id);
-  JS_NewClass(JS_GetRuntime(ctx), js_text_decoder_class_id, &js_text_decoder_class);
-  text_decoder_proto = JS_NewObject(ctx);
-  JS_SetPropertyFunctionList(ctx, text_decoder_proto, js_text_decoder_proto_funcs, countof(js_text_decoder_proto_funcs));
-  JS_SetClassProto(ctx, js_text_decoder_class_id, text_decoder_proto);
-
-  obj = JS_NewCFunction2(ctx, api_text_decoder_constructor, "TextDecoder", 0, JS_CFUNC_constructor, 0);
-
-  JSValue global_obj = JS_GetGlobalObject(ctx);
-  JS_SetPropertyStr(ctx, global_obj, "TextDecoder", obj);
-  JS_FreeValue(ctx, global_obj);
-}
-
-void init_text_encoder_class(JSContext *ctx) {
-  JSValue text_encoder_proto, obj;
-
-  JS_NewClassID(&js_text_encoder_class_id);
-  JS_NewClass(JS_GetRuntime(ctx), js_text_encoder_class_id, &js_text_encoder_class);
-  text_encoder_proto = JS_NewObject(ctx);
-  JS_SetPropertyFunctionList(ctx, text_encoder_proto, js_text_encoder_proto_funcs, countof(js_text_encoder_proto_funcs));
-  JS_SetClassProto(ctx, js_text_encoder_class_id, text_encoder_proto);
-
-  obj = JS_NewCFunction2(ctx, api_text_encoder_constructor, "TextEncoder", 0, JS_CFUNC_constructor, 0);
-
-  JSValue global_obj = JS_GetGlobalObject(ctx);
-  JS_SetPropertyStr(ctx, global_obj, "TextEncoder", obj);
-  JS_FreeValue(ctx, global_obj);
-}
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_text.h b/packages/android-engine/android-js-engine/src/main/cpp/api_text.h
deleted file mode 100644
index 31f74c4..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_text.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "quickjs/quickjs.h"
-
-#ifndef ANDROID_ENGINE_API_TEXT_H
-#define ANDROID_ENGINE_API_TEXT_H
-
-void init_text_encoder_class(JSContext *ctx);
-void init_text_decoder_class(JSContext *ctx);
-
-#endif //ANDROID_ENGINE_API_TEXT_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.cpp b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.cpp
new file mode 100644
index 0000000..29c2cb2
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.cpp
@@ -0,0 +1,60 @@
+#include "api_cap_device.h"
+
+#include "../context.h"
+#include "../errors.h"
+
+JSValue api_device_battery(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *device = env->GetObjectField(context->cap_api, context->java->capacitor_api_device_field);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  auto *j_json_str = (jstring)env->CallObjectMethod(device, context->java->capacitor_api_device_getBatteryStatus_method);
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  if (j_json_str == nullptr) {
+    return JS_NULL;
+  }
+
+  const auto *c_json_str = env->GetStringUTFChars(j_json_str, nullptr);
+
+  auto ret_value = JS_ParseJSON(ctx, c_json_str, strlen(c_json_str), "<parse battery status>");
+  env->ReleaseStringUTFChars(j_json_str, c_json_str);
+
+  return ret_value;
+}
+
+JSValue api_device_network(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *device = env->GetObjectField(context->cap_api, context->java->capacitor_api_device_field);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  auto *j_json_str = (jstring)env->CallObjectMethod(device, context->java->capacitor_api_device_getNetworkStatus_method);
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  if (j_json_str == nullptr) {
+    return JS_NULL;
+  }
+
+  const auto *c_json_str = env->GetStringUTFChars(j_json_str, nullptr);
+
+  auto ret_value = JS_ParseJSON(ctx, c_json_str, strlen(c_json_str), "<parse network status>");
+  env->ReleaseStringUTFChars(j_json_str, c_json_str);
+
+  return ret_value;
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_device.h b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.h
similarity index 52%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_device.h
rename to packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.h
index 42c1e03..c2caf81 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_device.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_device.h
@@ -1,9 +1,9 @@
-#ifndef CAPACITOR_BACKGROUND_RUNNER_API_DEVICE_H
-#define CAPACITOR_BACKGROUND_RUNNER_API_DEVICE_H
+#ifndef ANDROID_API_CAP_DEVICE_H
+#define ANDROID_API_CAP_DEVICE_H
 
-#include "quickjs/quickjs.h"
+#include "../quickjs/quickjs.h"
 
 JSValue api_device_battery(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 JSValue api_device_network(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 
-#endif //CAPACITOR_BACKGROUND_RUNNER_API_DEVICE_H
+#endif //ANDROID_API_CAP_DEVICE_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.cpp b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.cpp
new file mode 100644
index 0000000..aea1017
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.cpp
@@ -0,0 +1,32 @@
+#include "api_cap_geolocation.h"
+
+#include "../context.h"
+#include "../errors.h"
+
+JSValue api_geolocation_current_location(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *geolocation = env->GetObjectField(context->cap_api, context->java->capacitor_api_geolocation_field);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  auto value_j_str = (jstring)env->CallObjectMethod(geolocation, context->java->capacitor_api_geolocation_getCurrentPosition_method);
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  if (value_j_str == nullptr) {
+    return JS_NULL;
+  }
+
+  const auto *c_json_str = env->GetStringUTFChars(value_j_str, nullptr);
+
+  auto ret_value = JS_ParseJSON(ctx, c_json_str, strlen(c_json_str), "<parse geolocation response>");
+  env->ReleaseStringUTFChars(value_j_str, c_json_str);
+
+  return ret_value;
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.h b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.h
new file mode 100644
index 0000000..1483cc7
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_geolocation.h
@@ -0,0 +1,8 @@
+#ifndef ANDROID_API_CAP_GEOLOCATION_H
+#define ANDROID_API_CAP_GEOLOCATION_H
+
+#include "../quickjs/quickjs.h"
+
+JSValue api_geolocation_current_location(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+#endif //ANDROID_API_CAP_GEOLOCATION_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.cpp b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.cpp
new file mode 100644
index 0000000..71d5890
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.cpp
@@ -0,0 +1,84 @@
+#include "api_cap_kv.h"
+
+#include "../context.h"
+#include "../errors.h"
+
+JSValue api_kv_set(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  const auto *key_c_str = JS_ToCString(ctx, argv[0]);
+  const auto *value_c_str = JS_ToCString(ctx, argv[1]);
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *kv = env->GetObjectField(context->cap_api, context->java->capacitor_api_kv_field);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    JS_FreeCString(ctx, key_c_str);
+    return exception;
+  }
+
+  jstring key_j_str = env->NewStringUTF(key_c_str);
+  jstring value_j_str = env->NewStringUTF(value_c_str);
+
+  env->CallVoidMethod(kv, context->java->capacitor_api_kv_set_method, key_j_str, value_j_str);
+
+  JS_FreeCString(ctx, key_c_str);
+  JS_FreeCString(ctx, value_c_str);
+
+  return JS_UNDEFINED;
+}
+
+JSValue api_kv_get(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  const auto *key_c_str = JS_ToCString(ctx, argv[0]);
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *kv = env->GetObjectField(context->cap_api, context->java->capacitor_api_kv_field);
+
+  jstring key_j_str = env->NewStringUTF(key_c_str);
+
+  auto *value_j_str = (jstring)env->CallObjectMethod(kv, context->java->capacitor_api_kv_get_method, key_j_str);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    JS_FreeCString(ctx, key_c_str);
+    return exception;
+  }
+
+  if (value_j_str == nullptr) {
+    JS_FreeCString(ctx, key_c_str);
+    return JS_NULL;
+  }
+
+  const auto *value_c_str = env->GetStringUTFChars(value_j_str, nullptr);
+  auto value_str_obj = JS_NewString(ctx, value_c_str);
+
+  auto ret_value = JS_NewObject(ctx);
+  JS_SetPropertyStr(ctx, ret_value, "value", value_str_obj);
+
+  env->ReleaseStringUTFChars(value_j_str, value_c_str);
+  JS_FreeCString(ctx, key_c_str);
+
+  return ret_value;
+}
+
+JSValue api_kv_remove(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  const auto *key_c_str = JS_ToCString(ctx, argv[0]);
+
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *kv = env->GetObjectField(context->cap_api, context->java->capacitor_api_kv_field);
+
+  jstring key_j_str = env->NewStringUTF(key_c_str);
+
+  env->CallVoidMethod(kv, context->java->capacitor_api_kv_remove_method, key_j_str);
+  JS_FreeCString(ctx, key_c_str);
+
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  return JS_UNDEFINED;
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/api_kv.h b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.h
similarity index 60%
rename from packages/android-engine/android-js-engine/src/main/cpp/api_kv.h
rename to packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.h
index da1c729..bdfb0f3 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/api_kv.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_kv.h
@@ -1,10 +1,10 @@
-#ifndef ANDROID_ENGINE_API_KV_H
-#define ANDROID_ENGINE_API_KV_H
+#ifndef CAPACITOR_BACKGROUND_RUNNER_API_CAP_KV_H
+#define CAPACITOR_BACKGROUND_RUNNER_API_CAP_KV_H
 
-#include "quickjs/quickjs.h"
+#include "../quickjs/quickjs.h"
 
 JSValue api_kv_set(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 JSValue api_kv_get(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 JSValue api_kv_remove(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
 
-#endif //ANDROID_ENGINE_API_KV_H
+#endif //CAPACITOR_BACKGROUND_RUNNER_API_CAP_KV_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.cpp b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.cpp
new file mode 100644
index 0000000..94f16e5
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.cpp
@@ -0,0 +1,31 @@
+#include "api_cap_notifications.h"
+
+#include "../context.h"
+#include "../errors.h"
+
+JSValue api_notifications_schedule(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
+  auto *env = context->java->getEnv();
+
+  auto *notification = env->GetObjectField(context->cap_api, context->java->capacitor_api_notification_field);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  auto options_str = JS_JSONStringify(ctx, argv[0], JS_UNDEFINED, JS_UNDEFINED);
+  const auto *options_c_str = JS_ToCString(ctx, options_str);
+  auto *options_j_str = env->NewStringUTF(options_c_str);
+
+  env->CallVoidMethod(notification, context->java->capacitor_api_notifications_schedule_method, options_j_str);
+
+  JS_FreeCString(ctx, options_c_str);
+  JS_FreeValue(ctx, options_str);
+
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  return JS_UNDEFINED;
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.h b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.h
new file mode 100644
index 0000000..a029473
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/cap_api/api_cap_notifications.h
@@ -0,0 +1,8 @@
+#ifndef ANDROID_API_CAP_NOTIFICATIONS_H
+#define ANDROID_API_CAP_NOTIFICATIONS_H
+
+#include "../quickjs/quickjs.h"
+
+JSValue api_notifications_schedule(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+#endif //ANDROID_API_CAP_NOTIFICATIONS_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/context.cpp b/packages/android-engine/android-js-engine/src/main/cpp/context.cpp
index b18ee4d..2b2dda6 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/context.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/context.cpp
@@ -1,257 +1,194 @@
 #include "context.h"
 
-#include <cstring>
-#include <iostream>
-#include <thread>
-#include <utility>
-
 #include "errors.h"
+#include "quickjs/cutils.h"
 
-JavaFunctionData::JavaFunctionData(const std::string &name, jobject func) {
-  this->name = name;
-  this->j_func = func;
-}
-
-Context::Context(const std::string &name, JSRuntime *rt, JNIEnv *env, jobject api_instance) {
-  this->vm = nullptr;
-  this->capacitor_api = nullptr;
-
-  this->ctx = JS_NewContext(rt);
+Context::Context(const std::string &name, JSRuntime *parent_rt, JNIEnv *env) {
   this->name = name;
-  this->env = env;
-
-  this->env->GetJavaVM(&this->vm);
+  this->qjs_context = JS_NewContext(parent_rt);
+  this->java = new Java(env);
+  this->cap_api = nullptr;
 
-  this->api = api_instance;
-
-  this->run_loop_stopped = true;
-  this->end_run_loop = false;
-
-  this->jni_classes = new JNIClasses(env);
+  JS_SetContextOpaque(this->qjs_context, this);
 
   this->init_api_console();
   this->init_api_event_listeners();
-  this->init_api_crypto();
   this->init_api_timeout();
+  this->init_api_crypto();
   this->init_api_text();
   this->init_api_fetch();
+  this->init_api_blob();
 
-  JS_SetContextOpaque(this->ctx, this);
-
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
-  this->global_json_obj = JS_GetPropertyStr(this->ctx, global_obj, "JSON");
-  JS_FreeValue(this->ctx, global_obj);
+  this->log_debug("created context");
 }
 
 Context::~Context() {
-  this->stop_run_loop();
-
   for (const auto &kv : this->event_listeners) {
-    JS_FreeValue(this->ctx, kv.second);
+    JS_FreeValue(this->qjs_context, kv.second);
   }
-
   this->event_listeners.clear();
+  this->registered_functions.clear();
 
   for (const auto &kv : this->timers) {
-    JS_FreeValue(this->ctx, kv.second.js_func);
+    JS_FreeValue(this->qjs_context, kv.second.js_func);
   }
-
   this->timers.clear();
 
-  this->registered_functions.clear();
+  JS_FreeContext(this->qjs_context);
 
-  JS_FreeValue(this->ctx, this->global_json_obj);
-  JS_FreeContext(this->ctx);
+  this->log_debug("destroyed context");
 }
 
-JNIEnv *Context::getJNIEnv() {
-  JNIEnv *env = nullptr;
-
-  int status = this->vm->GetEnv((void **)&env, JNI_VERSION_1_6);
-  if (status == JNI_EDETACHED) {
-    if (this->vm->AttachCurrentThread(&env, NULL) != JNI_OK) {
-      // TODO: throw exception here
-      return nullptr;
+void Context::run_loop() {
+  if (!this->timers.empty()) {
+    for (const auto &timer_kv : this->timers) {
+      auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - timer_kv.second.start);
+      if (duration.count() >= timer_kv.second.timeout) {
+        this->timers[timer_kv.first].start = std::chrono::system_clock::now();
+        this->execute_timer(timer_kv.second.js_func);
+        if (!this->timers[timer_kv.first].repeat) {
+          JS_FreeValue(this->qjs_context, this->timers[timer_kv.first].js_func);
+          this->timers.erase(timer_kv.first);
+        }
+      }
     }
   }
-
-  if (status == JNI_EVERSION) {
-    // TODO: throw exception here
-    return nullptr;
-  }
-
-  return env;
 }
 
-void Context::start_run_loop() {
-  this->end_run_loop = false;
+static JSValue call_registered_function(JSContext *ctx, JSValue this_val, int argc, JSValue *argv, int magic, JSValue *func_data) {
+  JSValue ret_value = JS_UNDEFINED;
 
-  this->run_loop_thread = std::thread([this] { run_loop(); });
+  auto *context = (Context *)JS_GetContextOpaque(ctx);
 
-  this->run_loop_thread.detach();
+  JSValue func_name_obj = func_data[0];
+  auto func_name_str = std::string(JS_ToCString(ctx, func_name_obj));
+  JS_FreeValue(ctx, func_name_obj);
 
-  this->run_loop_stopped = false;
-}
+  auto j_func = context->registered_functions.at(func_name_str);
 
-void Context::stop_run_loop() {
-  if (this->end_run_loop) {
-    return;
+  auto *env = context->java->getEnv();
+  if (env == nullptr) {
+    throw_js_exception(ctx, "JVM Environment is null");
+    return JS_UNDEFINED;
   }
 
-  this->run_loop_mutex.lock();
-  this->end_run_loop = true;
-  this->run_loop_mutex.unlock();
-
-  while (!this->run_loop_stopped) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+  auto j_function_class = env->GetObjectClass(j_func);
+  auto exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
   }
-}
-
-void Context::run_loop() {
-  for (;;) {
-    this->run_loop_mutex.lock();
-    if (this->end_run_loop) {
-      break;
-    }
-    this->run_loop_mutex.unlock();
-
-    if (!this->timers.empty()) {
-      this->timers_mutex.lock();
-      JSValue global_obj = JS_GetGlobalObject(this->ctx);
-
-      for (const auto &kv : this->timers) {
-        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now() - kv.second.start);
-
-        if (duration.count() >= kv.second.timeout) {
-          this->timers[kv.first].start = std::chrono::system_clock::now();
-          JSValue value = JS_Call(this->ctx, this->timers[kv.first].js_func, global_obj, 0, nullptr);
-          JS_FreeValue(this->ctx, value);
-
-          if (!this->timers[kv.first].repeat) {
-            JS_FreeValue(this->ctx, this->timers[kv.first].js_func);
-            this->timers.erase(kv.first);
-          }
-        }
-      }
 
-      this->timers_mutex.unlock();
-
-      JS_FreeValue(this->ctx, global_obj);
-    }
+  auto j_method = env->GetMethodID(j_function_class, "run", "()V");
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
   }
 
-  this->run_loop_stopped = true;
-}
-
-JSValue Context::parseJSON(const std::string &json_string) const {
-  JSValue ret_value = JS_UNDEFINED;
-
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
-  JSValue parse_func_obj = JS_GetPropertyStr(this->ctx, this->global_json_obj, "parse");
-
-  JSValue json = JS_NewString(this->ctx, json_string.c_str());
-
-  JSValue parsed = JS_Call(this->ctx, parse_func_obj, global_obj, 1, &json);
+  JSValue args = argv[0];
+  if (!JS_IsNull(args) && !JS_IsUndefined(args)) {
+    std::string json_string;
 
-  ret_value = JS_DupValue(this->ctx, parsed);
+    if (JS_IsError(context->qjs_context, args)) {
+      auto error_object = JS_NewObject(ctx);
 
-  JS_FreeValue(this->ctx, parsed);
-  JS_FreeValue(this->ctx, json);
-  JS_FreeValue(this->ctx, parse_func_obj);
-  JS_FreeValue(this->ctx, global_obj);
+      auto error_name = JS_GetPropertyStr(ctx, args, "name");
+      auto error_message = JS_GetPropertyStr(ctx, args, "message");
 
-  return ret_value;
-}
+      JS_SetPropertyStr(ctx, error_object, "name", error_name);
+      JS_SetPropertyStr(ctx, error_object, "message", error_message);
 
-void Context::init_callbacks(JSValue callbacks) const {
-  // look for __cbr:: and replace with JSFunction
-  JSPropertyEnum *properties;
-  uint32_t count;
-  JS_GetOwnPropertyNames(this->ctx, &properties, &count, callbacks, JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK | JS_GPN_ENUM_ONLY);
-  for (uint32_t i = 0; i < count; i++) {
-    JSAtom atom = properties[i].atom;
-    const char *key = JS_AtomToCString(this->ctx, atom);
+      auto json_string_obj = JS_JSONStringify(ctx, error_object, JS_UNDEFINED, JS_UNDEFINED);
+      auto json_c_string = JS_ToCString(ctx, json_string_obj);
 
-    JSValue val = JS_GetProperty(this->ctx, callbacks, atom);
+      json_string = std::string(json_c_string);
 
-    if (JS_IsString(val)) {
-      const char *c_str_val = JS_ToCString(this->ctx, val);
-      std::string str_value = std::string(c_str_val);
+      JS_FreeCString(ctx, json_c_string);
+      JS_FreeValue(ctx, json_string_obj);
+      JS_FreeValue(ctx, error_object);
+    } else {
+      auto json_string_obj = JS_JSONStringify(ctx, args, JS_UNDEFINED, JS_UNDEFINED);
+      auto json_c_string = JS_ToCString(ctx, json_string_obj);
 
-      std::string prefix = str_value.substr(0, 7);
+      json_string = std::string(json_c_string);
 
-      if (prefix == "__cbr::") {
-        try {
-          auto global_func_name = str_value.substr(7);
-          auto func_data = this->registered_functions.at(global_func_name);
+      JS_FreeCString(ctx, json_c_string);
+      JS_FreeValue(ctx, json_string_obj);
+    }
 
-          JSValue ptr[1] = {JS_NewString(this->ctx, global_func_name.c_str())};
+    jstring j_json_string = env->NewStringUTF(json_string.c_str());
 
-          JS_SetPropertyStr(this->ctx, callbacks, key, JS_NewCFunctionData(this->ctx, call_global_function, 1, 0, 1, ptr));
-        } catch (std::exception &ex) {
-        }
-      }
+    // create a JSONObject
+    jclass json_object_class = env->FindClass("org/json/JSONObject");
+    jmethodID json_object_constructor = env->GetMethodID(json_object_class, "<init>", "(Ljava/lang/String;)V");
+    exception = throw_jvm_exception_in_js(env, ctx);
+    if (JS_IsException(exception)) {
+      return exception;
+    }
 
-      JS_FreeCString(this->ctx, c_str_val);
+    jobject json_object = env->NewObject(json_object_class, json_object_constructor, j_json_string);
+    exception = throw_jvm_exception_in_js(env, ctx);
+    if (JS_IsException(exception)) {
+      return exception;
     }
 
-    JS_FreeValue(this->ctx, val);
-    JS_FreeAtom(this->ctx, atom);
-    JS_FreeCString(this->ctx, key);
+    jfieldID args_field = env->GetFieldID(j_function_class, "args", "Lorg/json/JSONObject;");
+    env->SetObjectField(j_func, args_field, json_object);
   }
-}
 
-std::string Context::stringifyJSON(JSValue object) const {
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
-  JSValue stringify_func_obj = JS_GetPropertyStr(this->ctx, this->global_json_obj, "stringify");
+  env->CallVoidMethod(j_func, j_method);
+  exception = throw_jvm_exception_in_js(env, ctx);
+  if (JS_IsException(exception)) {
+    return exception;
+  }
+
+  return ret_value;
+}
 
-  JSValue str_value = JS_Call(this->ctx, stringify_func_obj, global_obj, 1, &object);
+void Context::register_function(const std::string &func_name, jobject func) {
+  this->registered_functions.insert_or_assign(func_name, func);
 
-  const char *c_str = JS_ToCString(this->ctx, str_value);
+  auto global_obj = JS_GetGlobalObject(this->qjs_context);
+  auto func_name_value = JS_NewString(this->qjs_context, func_name.c_str());
 
-  std::string json(c_str);
+  JSValueConst ptr[1];
+  ptr[0] = func_name_value;
 
-  JS_FreeCString(this->ctx, c_str);
-  JS_FreeValue(this->ctx, str_value);
-  JS_FreeValue(this->ctx, stringify_func_obj);
-  JS_FreeValue(this->ctx, global_obj);
+  JS_SetPropertyStr(this->qjs_context, global_obj, func_name.c_str(), JS_NewCFunctionData(this->qjs_context, call_registered_function, 1, 0, 1, ptr));
 
-  return json;
+  JS_FreeValue(this->qjs_context, func_name_value);
+  JS_FreeValue(this->qjs_context, global_obj);
 }
 
 JSValue Context::evaluate(const std::string &code, bool ret_val) const {
   JSValue ret_value = JS_UNDEFINED;
 
   int flags = JS_EVAL_TYPE_GLOBAL | JS_EVAL_FLAG_BACKTRACE_BARRIER;
+  size_t len = strlen(code.c_str());
 
-  size_t code_len = strlen(code.c_str());
-
-  JSValue value = JS_Eval(this->ctx, code.c_str(), code_len, "<code>", flags);
+  write_to_logcat(ANDROID_LOG_DEBUG, "[RUNNER DEV TRACER]", "evaluate context code");
+  JSValue value = JS_Eval(this->qjs_context, code.c_str(), len, "<code>", flags);
 
   if (JS_IsException(value)) {
-    ret_value = JS_DupValue(this->ctx, value);
-    JS_FreeValue(this->ctx, value);
-
+    ret_value = JS_DupValue(this->qjs_context, value);
+    JS_FreeValue(this->qjs_context, value);
     return ret_value;
   }
 
   if (ret_val) {
-    std::string json = this->stringifyJSON(value);
-
-    JSValue json_value = JS_NewString(this->ctx, json.c_str());
-    ret_value = JS_DupValue(this->ctx, json_value);
+    JSValue json = JS_JSONStringify(this->qjs_context, value, JS_UNDEFINED, JS_UNDEFINED);
 
-    JS_FreeValue(this->ctx, json_value);
+    ret_value = JS_DupValue(this->qjs_context, json);
+    JS_FreeValue(this->qjs_context, json);
   }
 
-  JS_FreeValue(this->ctx, value);
+  JS_FreeValue(this->qjs_context, value);
   return ret_value;
 }
 
 JSValue Context::dispatch_event(const std::string &event, JSValue details) {
   JSValue ret_value = JS_UNDEFINED;
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
 
+  JSValue global_obj = JS_GetGlobalObject(this->qjs_context);
   JSValue event_handler;
 
   try {
@@ -262,264 +199,234 @@ JSValue Context::dispatch_event(const std::string &event, JSValue details) {
 
   if (!JS_IsNull(event_handler)) {
     JSValueConst args[3];
-
-    JSValue dataArgs = JS_GetPropertyStr(this->ctx, details, "dataArgs");
-    JSValue callbacks = JS_GetPropertyStr(this->ctx, details, "callbacks");
+    JSValue dataArgs = JS_GetPropertyStr(this->qjs_context, details, "dataArgs");
+    JSValue callbacks = JS_GetPropertyStr(this->qjs_context, details, "callbacks");
 
     int nextArgIndex = 0;
 
     if (!JS_IsNull(callbacks) && !JS_IsUndefined(callbacks)) {
       this->init_callbacks(callbacks);
 
-      JSValue resolveFunc = JS_GetPropertyStr(this->ctx, callbacks, "resolve");
-      JSValue rejectFunc = JS_GetPropertyStr(this->ctx, callbacks, "reject");
+      JSValue resolveFunc = JS_GetPropertyStr(this->qjs_context, callbacks, "resolve");
+      JSValue rejectFunc = JS_GetPropertyStr(this->qjs_context, callbacks, "reject");
 
       args[0] = resolveFunc;
       args[1] = rejectFunc;
       nextArgIndex = 2;
 
-      JS_FreeValue(this->ctx, resolveFunc);
-      JS_FreeValue(this->ctx, rejectFunc);
+      JS_FreeValue(this->qjs_context, resolveFunc);
+      JS_FreeValue(this->qjs_context, rejectFunc);
     }
 
     if (JS_IsNull(dataArgs) || JS_IsUndefined(dataArgs)) {
-      dataArgs = JS_DupValue(this->ctx, details);
+      dataArgs = JS_DupValue(this->qjs_context, details);
     }
 
     args[nextArgIndex] = dataArgs;
 
-    JSValue value = JS_Call(this->ctx, event_handler, global_obj, 3, args);
+    JSValue value = JS_Call(this->qjs_context, event_handler, global_obj, 3, args);
 
     if (JS_IsException(value)) {
-      ret_value = JS_DupValue(this->ctx, value);
-      JS_FreeValue(this->ctx, value);
+      ret_value = JS_DupValue(this->qjs_context, value);
+      JS_FreeValue(this->qjs_context, value);
     }
 
-    JS_FreeValue(this->ctx, callbacks);
-    JS_FreeValue(this->ctx, dataArgs);
-    JS_FreeValue(this->ctx, value);
+    // TODO: add warning for non-null value;
+
+    JS_FreeValue(this->qjs_context, callbacks);
+    JS_FreeValue(this->qjs_context, dataArgs);
+    JS_FreeValue(this->qjs_context, value);
   }
 
-  JS_FreeValue(this->ctx, global_obj);
+  JS_FreeValue(this->qjs_context, global_obj);
+
   return ret_value;
 }
 
-void Context::init_api_console() const {
-  JSValue global_obj, console;
-
-  global_obj = JS_GetGlobalObject(this->ctx);
-  console = JS_NewObject(this->ctx);
-
-  JS_SetPropertyStr(this->ctx, console, "log", JS_NewCFunction(ctx, api_console_log, "log", 1));
-  JS_SetPropertyStr(this->ctx, console, "info", JS_NewCFunction(ctx, api_console_log, "info", 1));
-  JS_SetPropertyStr(this->ctx, console, "warn", JS_NewCFunction(ctx, api_console_warn, "warn", 1));
-  JS_SetPropertyStr(this->ctx, console, "error", JS_NewCFunction(ctx, api_console_error, "error", 1));
-  JS_SetPropertyStr(this->ctx, console, "debug", JS_NewCFunction(ctx, api_console_debug, "debug", 1));
+void Context::init_capacitor_api(jobject cap_api_obj) {
+  this->cap_api = cap_api_obj;
 
-  JS_SetPropertyStr(this->ctx, global_obj, "console", console);
-
-  JS_FreeValue(this->ctx, global_obj);
+  this->init_capacitor_kv_api();
+  this->init_capacitor_device_api();
+  this->init_capacitor_notifications_api();
+  this->init_capacitor_geolocation_api();
 }
 
-void Context::init_api_event_listeners() const {
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
-
-  JS_SetPropertyStr(this->ctx, global_obj, "addEventListener", JS_NewCFunction(this->ctx, api_add_event_listener, "addEventListener", 2));
-
-  JS_FreeValue(this->ctx, global_obj);
-}
+void Context::init_callbacks(JSValue callbacks) const {
+  // look for __cbr:: and replace with JSFunction
+  JSPropertyEnum *properties;
+  uint32_t count;
+  JS_GetOwnPropertyNames(this->qjs_context, &properties, &count, callbacks, JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK | JS_GPN_ENUM_ONLY);
+  for (uint32_t i = 0; i < count; i++) {
+    JSAtom atom = properties[i].atom;
+    const char *key = JS_AtomToCString(this->qjs_context, atom);
+    JSValue str_val = JS_GetProperty(this->qjs_context, callbacks, atom);
 
-void Context::init_api_crypto() const {
-  JSValue global_obj, crypto;
+    if (JS_IsString(str_val)) {
+      const char *c_str_val = JS_ToCString(this->qjs_context, str_val);
 
-  global_obj = JS_GetGlobalObject(this->ctx);
+      std::string const str_value = std::string(c_str_val);
+      std::string const prefix = str_value.substr(0, 7);
 
-  crypto = JS_NewObject(this->ctx);
+      if (prefix == "__cbr::") {
+        try {
+          auto global_func_name = str_value.substr(7);
 
-  JS_SetPropertyStr(this->ctx, crypto, "getRandomValues", JS_NewCFunction(ctx, api_crypto_get_random_values, "getRandomValues", 1));
-  JS_SetPropertyStr(this->ctx, crypto, "randomUUID", JS_NewCFunction(ctx, api_crypto_random_uuid, "randomUUID", 0));
+          if (this->registered_functions.find(global_func_name) != this->registered_functions.end()) {
+            auto func_name_value = JS_NewString(this->qjs_context, global_func_name.c_str());
 
-  JS_SetPropertyStr(this->ctx, global_obj, "crypto", crypto);
+            JSValueConst ptr[1];
+            ptr[0] = func_name_value;
 
-  JS_FreeValue(this->ctx, global_obj);
-}
+            JS_SetPropertyStr(this->qjs_context, callbacks, key, JS_NewCFunctionData(this->qjs_context, call_registered_function, 1, 0, 1, ptr));
 
-void Context::init_api_timeout() const {
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
+            JS_FreeValue(this->qjs_context, func_name_value);
+          }
+        } catch (std::exception &ex) {
+        }
+      }
 
-  JS_SetPropertyStr(this->ctx, global_obj, "setTimeout", JS_NewCFunction(this->ctx, api_set_timeout, "setTimeout", 2));
-  JS_SetPropertyStr(this->ctx, global_obj, "clearTimeout", JS_NewCFunction(this->ctx, api_clear_timeout, "clearTimeout", 1));
-  JS_SetPropertyStr(this->ctx, global_obj, "setInterval", JS_NewCFunction(this->ctx, api_set_interval, "setInterval", 1));
-  JS_SetPropertyStr(this->ctx, global_obj, "clearInterval", JS_NewCFunction(this->ctx, api_clear_timeout, "clearInterval", 1));
+      JS_FreeCString(this->qjs_context, c_str_val);
+    }
 
-  JS_FreeValue(this->ctx, global_obj);
+    JS_FreeValue(this->qjs_context, str_val);
+    JS_FreeAtom(this->qjs_context, atom);
+    JS_FreeCString(this->qjs_context, key);
+  }
 }
 
-void Context::init_api_text() const {
-  init_text_encoder_class(this->ctx);
-  init_text_decoder_class(this->ctx);
+void Context::log_debug(const std::string &msg) const {
+  auto tag = "[Runner Context " + this->name + "]";
+  write_to_logcat(ANDROID_LOG_DEBUG, tag.c_str(), msg.c_str());
 }
 
-void Context::init_api_fetch() const {
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
-
-  JS_SetPropertyStr(this->ctx, global_obj, "fetch", JS_NewCFunction(this->ctx, api_fetch_promise, "fetch", 2));
-
-  JS_FreeValue(this->ctx, global_obj);
+void Context::execute_timer(JSValue timerFunc) const {
+  write_to_logcat(ANDROID_LOG_DEBUG, "[RUNNER DEV TRACER]", "fire timer");
+  JSValue dupFunc = JS_DupValue(this->qjs_context, timerFunc);
+  auto ret = JS_Call(this->qjs_context, dupFunc, JS_UNDEFINED, 0, nullptr);
+  JS_FreeValue(this->qjs_context, dupFunc);
+  JS_FreeValue(this->qjs_context, ret);
 }
 
-void Context::register_function(const std::string &func_name, jobject func) {
-  JavaFunctionData func_data = JavaFunctionData(func_name, func);
-  this->registered_functions.insert_or_assign(func_name, func_data);
-
-  JSValue global_obj = JS_GetGlobalObject(this->ctx);
+void Context::init_api_console() const {
+  JSValue global_obj, console;
 
-  JSValue ptr[1] = {JS_NewString(this->ctx, func_name.c_str())};
-  JS_SetPropertyStr(this->ctx, global_obj, func_name.c_str(), JS_NewCFunctionData(this->ctx, call_global_function, 1, 0, 1, ptr));
+  global_obj = JS_GetGlobalObject(this->qjs_context);
+  console = JS_NewObject(this->qjs_context);
 
-  JS_FreeValue(this->ctx, global_obj);
-}
+  JS_SetPropertyStr(this->qjs_context, console, "log", JS_NewCFunction(qjs_context, api_console_log, "log", 1));
+  JS_SetPropertyStr(this->qjs_context, console, "info", JS_NewCFunction(qjs_context, api_console_log, "info", 1));
+  JS_SetPropertyStr(this->qjs_context, console, "warn", JS_NewCFunction(qjs_context, api_console_warn, "warn", 1));
+  JS_SetPropertyStr(this->qjs_context, console, "error", JS_NewCFunction(qjs_context, api_console_error, "error", 1));
+  JS_SetPropertyStr(this->qjs_context, console, "debug", JS_NewCFunction(qjs_context, api_console_debug, "debug", 1));
 
-void Context::init_capacitor_api(jobject cap_api) {
-  this->capacitor_api = cap_api;
+  JS_SetPropertyStr(this->qjs_context, global_obj, "console", console);
 
-  this->init_capacitor_kv_api();
-  this->init_capacitor_geolocation_api();
-  this->init_capacitor_notifications_api();
-  this->init_capacitor_device_api();
+  JS_FreeValue(this->qjs_context, global_obj);
 }
 
-void Context::init_capacitor_kv_api() const {
-  JSValue global_obj, kv;
-
-  global_obj = JS_GetGlobalObject(this->ctx);
-
-  kv = JS_NewObject(this->ctx);
-  JS_SetPropertyStr(this->ctx, kv, "set", JS_NewCFunction(this->ctx, api_kv_set, "set", 2));
-  JS_SetPropertyStr(this->ctx, kv, "get", JS_NewCFunction(this->ctx, api_kv_get, "get", 1));
-  JS_SetPropertyStr(this->ctx, kv, "remove", JS_NewCFunction(this->ctx, api_kv_remove, "remove", 1));
+void Context::init_api_event_listeners() const {
+  JSValue global_obj = JS_GetGlobalObject(this->qjs_context);
 
-  JS_SetPropertyStr(this->ctx, global_obj, "CapacitorKV", kv);
+  JS_SetPropertyStr(this->qjs_context, global_obj, "addEventListener", JS_NewCFunction(this->qjs_context, api_add_event_listener, "addEventListener", 2));
 
-  JS_FreeValue(this->ctx, global_obj);
+  JS_FreeValue(this->qjs_context, global_obj);
 }
 
-void Context::init_capacitor_device_api() const {
-  JSValue global_obj, device;
-
-  global_obj = JS_GetGlobalObject(this->ctx);
-
-  device = JS_NewObject(this->ctx);
-  JS_SetPropertyStr(this->ctx, device, "getBatteryStatus", JS_NewCFunction(this->ctx, api_device_battery, "getBatteryStatus", 0));
-  JS_SetPropertyStr(this->ctx, device, "getNetworkStatus", JS_NewCFunction(this->ctx, api_device_network, "getNetworkStatus", 0));
+void Context::init_api_timeout() const {
+  JSValue global_obj = JS_GetGlobalObject(this->qjs_context);
 
-  JS_SetPropertyStr(this->ctx, global_obj, "CapacitorDevice", device);
+  JS_SetPropertyStr(this->qjs_context, global_obj, "setTimeout", JS_NewCFunction(this->qjs_context, api_set_timeout, "setTimeout", 2));
+  JS_SetPropertyStr(this->qjs_context, global_obj, "clearTimeout", JS_NewCFunction(this->qjs_context, api_clear_timeout, "clearTimeout", 1));
+  JS_SetPropertyStr(this->qjs_context, global_obj, "setInterval", JS_NewCFunction(this->qjs_context, api_set_interval, "setInterval", 1));
+  JS_SetPropertyStr(this->qjs_context, global_obj, "clearInterval", JS_NewCFunction(this->qjs_context, api_clear_timeout, "clearInterval", 1));
 
-  JS_FreeValue(this->ctx, global_obj);
+  JS_FreeValue(this->qjs_context, global_obj);
 }
 
-void Context::init_capacitor_notifications_api() const {
-  JSValue global_obj, notifications;
-
-  global_obj = JS_GetGlobalObject(this->ctx);
-
-  notifications = JS_NewObject(this->ctx);
-  JS_SetPropertyStr(this->ctx, notifications, "schedule", JS_NewCFunction(this->ctx, api_notifications_schedule, "schedule", 1));
-
-  JS_SetPropertyStr(this->ctx, global_obj, "CapacitorNotifications", notifications);
+void Context::init_api_crypto() const {
+  JSValue global_obj, crypto;
 
-  JS_FreeValue(this->ctx, global_obj);
-}
+  global_obj = JS_GetGlobalObject(this->qjs_context);
 
-void Context::init_capacitor_geolocation_api() const {
-  JSValue global_obj, geolocation;
+  crypto = JS_NewObject(this->qjs_context);
 
-  global_obj = JS_GetGlobalObject(this->ctx);
-  geolocation = JS_NewObject(this->ctx);
+  JS_SetPropertyStr(this->qjs_context, crypto, "getRandomValues", JS_NewCFunction(this->qjs_context, api_crypto_get_random_values, "getRandomValues", 1));
+  JS_SetPropertyStr(this->qjs_context, crypto, "randomUUID", JS_NewCFunction(this->qjs_context, api_crypto_random_uuid, "randomUUID", 0));
 
-  JS_SetPropertyStr(this->ctx, geolocation, "getCurrentPosition", JS_NewCFunction(this->ctx, api_geolocation_current_location, "getCurrentPosition", 0));
+  JS_SetPropertyStr(this->qjs_context, global_obj, "crypto", crypto);
 
-  JS_SetPropertyStr(this->ctx, global_obj, "CapacitorGeolocation", geolocation);
+  JS_FreeValue(this->qjs_context, global_obj);
+}
 
-  JS_FreeValue(this->ctx, global_obj);
+void Context::init_api_text() const {
+  init_text_encoder_class(this->qjs_context);
+  init_text_decoder_class(this->qjs_context);
 }
 
-JSValue call_global_function(JSContext *ctx, JSValue this_val, int argc, JSValue *argv, int magic, JSValue *func_data) {
-  JSValue ret_value = JS_UNDEFINED;
-  JSValue jni_exception;
+void Context::init_api_fetch() const {
+  init_response_class(this->qjs_context);
 
-  JNIEnv *thread_env = nullptr;
-  JSValue func_name_obj = func_data[0];
+  JSValue global_obj = JS_GetGlobalObject(this->qjs_context);
 
-  const auto *func_name = JS_ToCString(ctx, func_name_obj);
-  auto func_name_str = std::string(func_name);
+  JS_SetPropertyStr(this->qjs_context, global_obj, "fetch", JS_NewCFunction(this->qjs_context, api_fetch, "fetch", 2));
 
-  JS_FreeValue(ctx, func_name_obj);
+  JS_FreeValue(this->qjs_context, global_obj);
+}
 
-  auto *parent_ctx = (Context *)JS_GetContextOpaque(ctx);
+void Context::init_api_blob() const { init_blob_class(this->qjs_context); }
 
-  auto status = parent_ctx->vm->GetEnv((void **)&thread_env, JNI_VERSION_1_6);
-  if (status == JNI_EDETACHED) {
-    if (parent_ctx->vm->AttachCurrentThread(&thread_env, NULL) != JNI_OK) {
-      return JS_EXCEPTION;
-    }
-  }
+void Context::init_capacitor_kv_api() const {
+  JSValue global_obj, kv;
 
-  auto j_func_data = parent_ctx->registered_functions.at(func_name);
+  global_obj = JS_GetGlobalObject(this->qjs_context);
 
-  jclass j_function_class = thread_env->GetObjectClass(j_func_data.j_func);
-  jni_exception = check_and_throw_jni_exception(thread_env, ctx);
+  kv = JS_NewObject(this->qjs_context);
+  JS_SetPropertyStr(this->qjs_context, kv, "set", JS_NewCFunction(this->qjs_context, api_kv_set, "set", 2));
+  JS_SetPropertyStr(this->qjs_context, kv, "get", JS_NewCFunction(this->qjs_context, api_kv_get, "get", 1));
+  JS_SetPropertyStr(this->qjs_context, kv, "remove", JS_NewCFunction(this->qjs_context, api_kv_remove, "remove", 1));
 
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
+  JS_SetPropertyStr(this->qjs_context, global_obj, "CapacitorKV", kv);
 
-  jmethodID j_method = thread_env->GetMethodID(j_function_class, "run", "()V");
-  jni_exception = check_and_throw_jni_exception(thread_env, ctx);
+  JS_FreeValue(this->qjs_context, global_obj);
+}
 
-  if (JS_IsException(jni_exception)) {
-    return jni_exception;
-  }
+void Context::init_capacitor_device_api() const {
+  JSValue global_obj, device;
 
-  JSValue args = argv[0];
-  if (!JS_IsNull(args) && !JS_IsUndefined(args)) {
-    std::string json_string;
+  global_obj = JS_GetGlobalObject(this->qjs_context);
 
-    if (JS_IsError(ctx, args)) {
-      auto error_object = JS_NewObject(ctx);
+  device = JS_NewObject(this->qjs_context);
+  JS_SetPropertyStr(this->qjs_context, device, "getBatteryStatus", JS_NewCFunction(this->qjs_context, api_device_battery, "getBatteryStatus", 0));
+  JS_SetPropertyStr(this->qjs_context, device, "getNetworkStatus", JS_NewCFunction(this->qjs_context, api_device_network, "getNetworkStatus", 0));
 
-      auto error_name = JS_GetPropertyStr(ctx, args, "name");
-      auto error_message = JS_GetPropertyStr(ctx, args, "message");
+  JS_SetPropertyStr(this->qjs_context, global_obj, "CapacitorDevice", device);
 
-      JS_SetPropertyStr(ctx, error_object, "name", error_name);
-      JS_SetPropertyStr(ctx, error_object, "message", error_message);
+  JS_FreeValue(this->qjs_context, global_obj);
+}
 
-      json_string = parent_ctx->stringifyJSON(error_object);
+void Context::init_capacitor_notifications_api() const {
+  JSValue global_obj, notifications;
 
-      JS_FreeValue(ctx, error_object);
-    } else {
-      json_string = parent_ctx->stringifyJSON(args);
-    }
+  global_obj = JS_GetGlobalObject(this->qjs_context);
 
-    jstring j_json_string = thread_env->NewStringUTF(json_string.c_str());
+  notifications = JS_NewObject(this->qjs_context);
+  JS_SetPropertyStr(this->qjs_context, notifications, "schedule", JS_NewCFunction(this->qjs_context, api_notifications_schedule, "schedule", 1));
 
-    // create a JSONObject
-    jclass json_object_c = thread_env->FindClass("org/json/JSONObject");
-    jmethodID json_object_cnstrctr = thread_env->GetMethodID(json_object_c, "<init>", "(Ljava/lang/String;)V");
+  JS_SetPropertyStr(this->qjs_context, global_obj, "CapacitorNotifications", notifications);
 
-    jobject json_object = thread_env->NewObject(json_object_c, json_object_cnstrctr, j_json_string);
-    jni_exception = check_and_throw_jni_exception(thread_env, ctx);
+  JS_FreeValue(this->qjs_context, global_obj);
+}
 
-    if (JS_IsException(jni_exception)) {
-      return jni_exception;
-    }
+void Context::init_capacitor_geolocation_api() const {
+  JSValue global_obj, geolocation;
 
-    jfieldID args_field = thread_env->GetFieldID(j_function_class, "args", "Lorg/json/JSONObject;");
+  global_obj = JS_GetGlobalObject(this->qjs_context);
+  geolocation = JS_NewObject(this->qjs_context);
 
-    thread_env->SetObjectField(j_func_data.j_func, args_field, json_object);
-  }
+  JS_SetPropertyStr(this->qjs_context, geolocation, "getCurrentPosition", JS_NewCFunction(this->qjs_context, api_geolocation_current_location, "getCurrentPosition", 0));
 
-  thread_env->CallVoidMethod(j_func_data.j_func, j_method);
+  JS_SetPropertyStr(this->qjs_context, global_obj, "CapacitorGeolocation", geolocation);
 
-  return ret_value;
-}
+  JS_FreeValue(this->qjs_context, global_obj);
+}
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/context.h b/packages/android-engine/android-js-engine/src/main/cpp/context.h
index 9d8bcee..2d9aecd 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/context.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/context.h
@@ -1,97 +1,70 @@
 #ifndef CAPACITOR_BACKGROUND_RUNNER_CONTEXT_H
 #define CAPACITOR_BACKGROUND_RUNNER_CONTEXT_H
-#include <jni.h>
-#include "quickjs/quickjs.h"
 #include <string>
 #include <unordered_map>
 
-#include <thread>
-#include <vector>
-#include <queue>
-
-#include "jni_classes.h"
+#include <jni.h>
 
-#include "api_events.h"
-#include "api_console.h"
-#include "api_crypto.h"
-#include "api_timeout.h"
-#include "api_text.h"
-#include "api_fetch.h"
+#include "./quickjs/quickjs.h"
 
-#include "api_kv.h"
-#include "api_device.h"
-#include "api_notifications.h"
-#include "api_geolocation.h"
+#include "java.h"
+#include "api/api_console.h"
+#include "api/api_timeout.h"
+#include "api/api_events.h"
+#include "api/api_crypto.h"
+#include "api/api_text.h"
+#include "api/api_fetch.h"
+#include "api/api_js_response.h"
+#include "api/api_blob.h"
 
-JSValue call_global_function(JSContext *ctx, JSValue this_val, int argc, JSValue *argv, int magic, JSValue *func_data);
-
-class JavaFunctionData {
-public:
-    std::string name;
-    jobject j_func;
-
-    JavaFunctionData(const std::string& name, jobject func);
-};
+#include "cap_api/api_cap_kv.h"
+#include "cap_api/api_cap_device.h"
+#include "cap_api/api_cap_geolocation.h"
+#include "cap_api/api_cap_notifications.h"
 
 class Context {
 public:
     std::string name;
 
-    JSContext *ctx;
-    JNIEnv *env;
-    JavaVM *vm;
-
-    JNIClasses *jni_classes;
-
-    jobject api;
-    jobject capacitor_api;
+    JSContext *qjs_context;
+    Java *java;
+    jobject cap_api;
 
     std::unordered_map<std::string, JSValue> event_listeners;
+    std::unordered_map<std::string, jobject> registered_functions;
     std::unordered_map<int, Timer> timers;
-    std::unordered_map<std::string, JavaFunctionData> registered_functions;
 
-    Context(const std::string& name, JSRuntime* rt, JNIEnv *env, jobject instance);
+    Context(const std::string& name, JSRuntime *parent_rt, JNIEnv *env);
     ~Context();
 
-    JNIEnv* getJNIEnv();
-
-    void start_run_loop();
-    void stop_run_loop();
-
-    std::mutex timers_mutex;
+    void run_loop();
 
+    void register_function(const std::string& func_name, jobject func);
     JSValue evaluate(const std::string& code, bool ret_val) const;
     JSValue dispatch_event(const std::string& event, JSValue details);
-    void register_function(const std::string& func_name, jobject func);
 
-    JSValue parseJSON(const std::string& json_string) const;
-    std::string stringifyJSON(JSValue object) const;
+    void init_capacitor_api(jobject cap_api_obj);
 
-    void init_capacitor_api(jobject cap_api);
 private:
-    JSValue global_json_obj;
-
-    std::thread run_loop_thread;
-    std::mutex run_loop_mutex;
-
-    bool run_loop_stopped;
-    bool end_run_loop;
+    void init_callbacks(JSValue callbacks) const;
+    void log_debug(const std::string& msg) const;
 
-    void run_loop();
+    void execute_timer(JSValue timerFunc) const;
 
     void init_api_console() const;
     void init_api_event_listeners() const;
-    void init_api_crypto() const;
     void init_api_timeout() const;
+    void init_api_crypto() const;
     void init_api_text() const;
     void init_api_fetch() const;
+    void init_api_blob() const;
 
     void init_capacitor_kv_api() const;
     void init_capacitor_device_api() const;
     void init_capacitor_notifications_api() const;
     void init_capacitor_geolocation_api() const;
-
-    void init_callbacks(JSValue callbacks) const;
 };
 
+
+
 #endif //CAPACITOR_BACKGROUND_RUNNER_CONTEXT_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/errors.cpp b/packages/android-engine/android-js-engine/src/main/cpp/errors.cpp
index 45cc862..42e7cf9 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/errors.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/errors.cpp
@@ -1,19 +1,19 @@
 #include "errors.h"
 
-bool check_and_throw_js_exception(JNIEnv *env, JSContext *ctx, JSValue value) {
+bool throw_js_exception_in_jvm(JNIEnv *env, JSContext *ctx, JSValue value) {
   if (JS_IsException(value)) {
     JS_FreeValue(ctx, value);
 
-    jclass c = env->FindClass("io/ionic/android_js_engine/EngineErrors$JavaScriptException");
+    jclass error_class = env->FindClass("io/ionic/android_js_engine/EngineErrors$JavaScriptException");
 
-    JSValue exception = JS_GetException(ctx);
+    JSValue const exception = JS_GetException(ctx);
 
-    JSValue err_message = JS_GetPropertyStr(ctx, exception, "message");
-    const char *err_str = JS_ToCString(ctx, err_message);
+    JSValue const err_message = JS_GetPropertyStr(ctx, exception, "message");
+    const char *err_message_c_str = JS_ToCString(ctx, err_message);
 
-    env->ThrowNew(c, err_str);
+    env->ThrowNew(error_class, err_message_c_str);
 
-    JS_FreeCString(ctx, err_str);
+    JS_FreeCString(ctx, err_message_c_str);
 
     JS_FreeValue(ctx, err_message);
     JS_FreeValue(ctx, exception);
@@ -24,27 +24,42 @@ bool check_and_throw_js_exception(JNIEnv *env, JSContext *ctx, JSValue value) {
   return false;
 }
 
-JSValue check_and_throw_jni_exception(JNIEnv *env, JSContext *ctx) {
+JSValue throw_jvm_exception_in_js(JNIEnv *env, JSContext *ctx) {
   if (!env->ExceptionCheck()) {
     return JS_NULL;
   }
 
-  auto throwable = env->ExceptionOccurred();
+  auto *throwable = env->ExceptionOccurred();
   env->ExceptionClear();
 
-  jclass c = env->FindClass("java/lang/Exception");
-  jmethodID cnstrctr = env->GetMethodID(c, "<init>", "(Ljava/lang/Throwable;)V");
-  jmethodID getMessage = env->GetMethodID(c, "getMessage", "()Ljava/lang/String;");
+  jclass exception_class = env->FindClass("java/lang/Exception");
+  jmethodID exception_constructor = env->GetMethodID(exception_class, "<init>", "(Ljava/lang/Throwable;)V");
+  jmethodID get_message_method = env->GetMethodID(exception_class, "getMessage", "()Ljava/lang/String;");
 
-  auto errObj = env->NewObject(c, cnstrctr, throwable);
-  auto errMsg = (jstring)env->CallObjectMethod(errObj, getMessage);
+  auto *err_obj = env->NewObject(exception_class, exception_constructor, throwable);
+  auto *err_msg = (jstring)env->CallObjectMethod(err_obj, get_message_method);
 
-  auto c_errMsg = env->GetStringUTFChars(errMsg, nullptr);
+  const auto *c_err_msg = env->GetStringUTFChars(err_msg, nullptr);
 
-  JSValue exceptionValue = JS_NewError(ctx);
-  JS_SetPropertyStr(ctx, exceptionValue, "message", JS_NewString(ctx, c_errMsg));
+  auto exception = throw_js_exception(ctx, c_err_msg);
 
-  env->ReleaseStringUTFChars(errMsg, c_errMsg);
+  env->ReleaseStringUTFChars(err_msg, c_err_msg);
 
-  return JS_Throw(ctx, exceptionValue);
+  return exception;
+}
+
+JSValue throw_js_exception(JSContext *ctx, const char *message) {
+  auto exception = JS_NewError(ctx);
+  JS_SetPropertyStr(ctx, exception, "message", JS_NewString(ctx, message));
+
+  return JS_Throw(ctx, exception);
+}
+
+void reject_promise(JSContext *ctx, JSValue reject_func, JSValue reject_obj) {
+  auto global_obj = JS_GetGlobalObject(ctx);
+  JSValueConst reject_args[1];
+  reject_args[0] = reject_obj;
+
+  JS_Call(ctx, reject_func, global_obj, 1, reject_args);
+  JS_FreeValue(ctx, global_obj);
 }
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/errors.h b/packages/android-engine/android-js-engine/src/main/cpp/errors.h
index abd66ed..af05c40 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/errors.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/errors.h
@@ -4,7 +4,9 @@
 #include <jni.h>
 #include "quickjs/quickjs.h"
 
-bool check_and_throw_js_exception(JNIEnv *env, JSContext *ctx, JSValue value);
-JSValue check_and_throw_jni_exception(JNIEnv *env, JSContext *ctx);
+bool throw_js_exception_in_jvm(JNIEnv *env, JSContext *ctx, JSValue value);
+JSValue throw_jvm_exception_in_js(JNIEnv *env, JSContext *ctx);
+JSValue throw_js_exception(JSContext *ctx, const char * message);
+void reject_promise(JSContext *ctx, JSValue reject_func, JSValue reject_obj);
 
 #endif //CAPACITOR_BACKGROUND_RUNNER_ERRORS_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/java.cpp b/packages/android-engine/android-js-engine/src/main/cpp/java.cpp
new file mode 100644
index 0000000..1645389
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/java.cpp
@@ -0,0 +1,177 @@
+#include "java.h"
+
+#include <stdexcept>
+
+Java::Java(JNIEnv *env) {
+  this->vm = nullptr;
+  env->GetJavaVM(&this->vm);
+
+  jclass tmp_class;
+
+  // Context API
+  tmp_class = env->FindClass("io/ionic/android_js_engine/WebAPI");
+  this->check_exception(env);
+
+  this->web_api_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/JSFetchOptions");
+  this->check_exception(env);
+
+  this->js_fetch_options_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/JSResponse");
+  this->check_exception(env);
+
+  this->js_response_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/api/CapacitorAPI");
+  this->check_exception(env);
+
+  this->capacitor_api_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/api/KVAPI");
+  this->check_exception(env);
+
+  this->capacitor_kv_api_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/api/DeviceAPI");
+  this->check_exception(env);
+
+  this->capacitor_device_api_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/api/GeolocationAPI");
+  this->check_exception(env);
+
+  this->capacitor_geolocation_api_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  tmp_class = env->FindClass("io/ionic/android_js_engine/api/NotificationsAPI");
+  this->check_exception(env);
+
+  this->capacitor_notification_api_class = (jclass)env->NewGlobalRef(tmp_class);
+  env->DeleteLocalRef(tmp_class);
+  tmp_class = nullptr;
+
+  this->web_api_byteArrayToString_method = env->GetStaticMethodID(this->web_api_class, "byteArrayToString", "([BLjava/lang/String;)Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->web_api_stringToByteArray_method = env->GetStaticMethodID(this->web_api_class, "stringToByteArray", "(Ljava/lang/String;)[B");
+  this->check_exception(env);
+
+  this->web_api_randomHashCode_method = env->GetStaticMethodID(this->web_api_class, "randomHashCode", "()I");
+  this->check_exception(env);
+
+  this->web_api_cryptoGetRandom_method = env->GetStaticMethodID(this->web_api_class, "cryptoGetRandom", "(I)[B");
+  this->check_exception(env);
+
+  this->web_api_cryptoRandomUUID_method = env->GetStaticMethodID(this->web_api_class, "cryptoRandomUUID", "()Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->web_api_fetch_method = env->GetStaticMethodID(this->web_api_class, "fetch", "(Ljava/lang/String;Lio/ionic/android_js_engine/JSFetchOptions;)Lio/ionic/android_js_engine/JSResponse;");
+  this->check_exception(env);
+
+  this->js_fetch_options_constructor = env->GetMethodID(this->js_fetch_options_class, "<init>", "(Ljava/lang/String;)V");
+  this->check_exception(env);
+
+  this->js_response_ok_field = env->GetFieldID(this->js_response_class, "ok", "Z");
+  this->check_exception(env);
+
+  this->js_response_status_field = env->GetFieldID(this->js_response_class, "status", "I");
+  this->check_exception(env);
+
+  this->js_response_url_field = env->GetFieldID(this->js_response_class, "url", "Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->js_response_data_field = env->GetFieldID(this->js_response_class, "data", "[B");
+  this->check_exception(env);
+
+  this->js_response_error_field = env->GetFieldID(this->js_response_class, "error", "Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->capacitor_api_kv_field = env->GetFieldID(this->capacitor_api_class, "kv", "Lio/ionic/android_js_engine/api/KVAPI;");
+  this->check_exception(env);
+
+  this->capacitor_api_device_field = env->GetFieldID(this->capacitor_api_class, "device", "Lio/ionic/android_js_engine/api/DeviceAPI;");
+  this->check_exception(env);
+
+  this->capacitor_api_geolocation_field = env->GetFieldID(this->capacitor_api_class, "geolocation", "Lio/ionic/android_js_engine/api/GeolocationAPI;");
+  this->check_exception(env);
+
+  this->capacitor_api_notification_field = env->GetFieldID(this->capacitor_api_class, "notifications", "Lio/ionic/android_js_engine/api/NotificationsAPI;");
+  this->check_exception(env);
+
+  // Capacitor API
+
+  this->capacitor_api_kv_set_method = env->GetMethodID(this->capacitor_kv_api_class, "set", "(Ljava/lang/String;Ljava/lang/String;)V");
+  this->check_exception(env);
+
+  this->capacitor_api_kv_get_method = env->GetMethodID(this->capacitor_kv_api_class, "get", "(Ljava/lang/String;)Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->capacitor_api_kv_remove_method = env->GetMethodID(this->capacitor_kv_api_class, "remove", "(Ljava/lang/String;)V");
+  this->check_exception(env);
+
+  this->capacitor_api_device_getBatteryStatus_method = env->GetMethodID(this->capacitor_device_api_class, "getBatteryStatus", "()Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->capacitor_api_device_getNetworkStatus_method = env->GetMethodID(this->capacitor_device_api_class, "getNetworkStatus", "()Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->capacitor_api_geolocation_getCurrentPosition_method = env->GetMethodID(this->capacitor_geolocation_api_class, "getCurrentPosition", "()Ljava/lang/String;");
+  this->check_exception(env);
+
+  this->capacitor_api_notifications_schedule_method = env->GetMethodID(this->capacitor_notification_api_class, "schedule", "(Ljava/lang/String;)V");
+  this->check_exception(env);
+}
+
+JNIEnv *Java::getEnv() {
+  JNIEnv *env = nullptr;
+
+  int status = this->vm->GetEnv((void **)&env, JNI_VERSION_1_6);
+  if (status == JNI_EDETACHED) {
+    if (this->vm->AttachCurrentThread(&env, NULL) != JNI_OK) {
+      // TODO: throw exception here
+      return nullptr;
+    }
+  }
+
+  if (status == JNI_EVERSION) {
+    // TODO: throw exception here
+    return nullptr;
+  }
+
+  return env;
+}
+
+void Java::check_exception(JNIEnv *env) {
+  if (!env->ExceptionCheck()) {
+    return;
+  }
+
+  auto *throwable = env->ExceptionOccurred();
+  env->ExceptionClear();
+
+  jclass exception_class = env->FindClass("java/lang/Exception");
+  jmethodID constructor = env->GetMethodID(exception_class, "<init>", "(Ljava/lang/Throwable;)V");
+  jmethodID get_message_method_id = env->GetMethodID(exception_class, "getMessage", "()Ljava/lang/String;");
+
+  auto *err_obj = env->NewObject(exception_class, constructor, throwable);
+  auto *err_msg = (jstring)env->CallObjectMethod(err_obj, get_message_method_id);
+
+  const auto *c_err_msg = env->GetStringUTFChars(err_msg, nullptr);
+
+  throw std::runtime_error(c_err_msg);
+}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/java.h b/packages/android-engine/android-js-engine/src/main/cpp/java.h
new file mode 100644
index 0000000..8938294
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/cpp/java.h
@@ -0,0 +1,51 @@
+#ifndef CAPACITOR_BACKGROUND_RUNNER_JAVA_H
+#define CAPACITOR_BACKGROUND_RUNNER_JAVA_H
+
+#include <jni.h>
+
+class Java {
+public:
+    JavaVM *vm;
+
+    jclass web_api_class;
+    jclass js_response_class;
+    jclass js_fetch_options_class;
+    jclass capacitor_api_class;
+    jclass capacitor_kv_api_class;
+    jclass capacitor_notification_api_class;
+    jclass capacitor_device_api_class;
+    jclass capacitor_geolocation_api_class;
+
+    jmethodID web_api_fetch_method;
+    jmethodID web_api_byteArrayToString_method;
+    jmethodID web_api_stringToByteArray_method;
+    jmethodID web_api_randomHashCode_method;
+    jmethodID web_api_cryptoRandomUUID_method;
+    jmethodID web_api_cryptoGetRandom_method;
+    jmethodID js_fetch_options_constructor;
+    jmethodID capacitor_api_kv_set_method;
+    jmethodID capacitor_api_kv_get_method;
+    jmethodID capacitor_api_kv_remove_method;
+    jmethodID capacitor_api_device_getBatteryStatus_method;
+    jmethodID capacitor_api_device_getNetworkStatus_method;
+    jmethodID capacitor_api_geolocation_getCurrentPosition_method;
+    jmethodID capacitor_api_notifications_schedule_method;
+
+    jfieldID js_response_ok_field;
+    jfieldID js_response_status_field;
+    jfieldID js_response_url_field;
+    jfieldID js_response_data_field;
+    jfieldID js_response_error_field;
+    jfieldID capacitor_api_kv_field;
+    jfieldID capacitor_api_device_field;
+    jfieldID capacitor_api_notification_field;
+    jfieldID capacitor_api_geolocation_field;
+
+    Java(JNIEnv *env);
+    JNIEnv *getEnv();
+
+private:
+    void check_exception(JNIEnv *env);
+};
+
+#endif //CAPACITOR_BACKGROUND_RUNNER_JAVA_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/jni_classes.cpp b/packages/android-engine/android-js-engine/src/main/cpp/jni_classes.cpp
deleted file mode 100644
index e598297..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/jni_classes.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "jni_classes.h"
-
-#include <stdexcept>
-
-JNIClasses::JNIClasses(JNIEnv *env) {
-  // get all needed JNI classes and methods
-
-  jclass tempClass;
-
-  // Context API
-  tempClass = env->FindClass("io/ionic/android_js_engine/ContextAPI");
-  this->check_exception(env);
-  this->context_api_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  tempClass = env->FindClass("io/ionic/android_js_engine/JSResponse");
-  this->check_exception(env);
-  this->js_response_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  tempClass = env->FindClass("io/ionic/android_js_engine/JSFetchOptions");
-  this->check_exception(env);
-  this->js_fetch_options_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  this->context_api_fetch_method = env->GetMethodID(this->context_api_class, "fetch", "(Ljava/lang/String;Lio/ionic/android_js_engine/JSFetchOptions;)Lio/ionic/android_js_engine/JSResponse;");
-  this->check_exception(env);
-
-  this->context_api_byteArrayToString_method = env->GetMethodID(this->context_api_class, "byteArrayToString", "([BLjava/lang/String;)Ljava/lang/String;");
-  this->check_exception(env);
-
-  this->context_api_randomHashCode_method = env->GetMethodID(this->context_api_class, "randomHashCode", "()I");
-  this->check_exception(env);
-
-  this->js_fetch_options_constructor = env->GetMethodID(this->js_fetch_options_class, "<init>", "(Ljava/lang/String;)V");
-  this->check_exception(env);
-
-  this->js_response_ok_field = env->GetFieldID(this->js_response_class, "ok", "Z");
-  this->check_exception(env);
-
-  this->js_response_status_field = env->GetFieldID(this->js_response_class, "status", "I");
-  this->check_exception(env);
-
-  this->js_response_url_field = env->GetFieldID(this->js_response_class, "url", "Ljava/lang/String;");
-  this->check_exception(env);
-
-  this->js_response_data_field = env->GetFieldID(this->js_response_class, "data", "[B");
-  this->check_exception(env);
-
-  this->js_response_error_field = env->GetFieldID(this->js_response_class, "error", "Ljava/lang/String;");
-  this->check_exception(env);
-
-  // Capacitor API
-  tempClass = env->FindClass("io/ionic/android_js_engine/api/CapacitorAPI");
-  this->check_exception(env);
-  this->capacitor_api_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  this->capacitor_api_kv_field = env->GetFieldID(this->capacitor_api_class, "kv", "Lio/ionic/android_js_engine/api/KVAPI;");
-  this->check_exception(env);
-
-  this->capacitor_api_device_field = env->GetFieldID(this->capacitor_api_class, "device", "Lio/ionic/android_js_engine/api/DeviceAPI;");
-  this->check_exception(env);
-
-  this->capacitor_api_geolocation_field = env->GetFieldID(this->capacitor_api_class, "geolocation", "Lio/ionic/android_js_engine/api/GeolocationAPI;");
-  this->check_exception(env);
-
-  this->capacitor_api_notification_field = env->GetFieldID(this->capacitor_api_class, "notifications", "Lio/ionic/android_js_engine/api/NotificationsAPI;");
-  this->check_exception(env);
-
-  tempClass = env->FindClass("io/ionic/android_js_engine/api/KVAPI");
-  this->check_exception(env);
-  this->kv_api_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  tempClass = env->FindClass("io/ionic/android_js_engine/api/NotificationsAPI");
-  this->check_exception(env);
-  this->notification_api_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  tempClass = env->FindClass("io/ionic/android_js_engine/api/DeviceAPI");
-  this->check_exception(env);
-  this->device_api_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-
-  tempClass = env->FindClass("io/ionic/android_js_engine/api/GeolocationAPI");
-  this->check_exception(env);
-  this->geolocation_api_class = (jclass)env->NewGlobalRef(tempClass);
-  env->DeleteLocalRef(tempClass);
-  tempClass = nullptr;
-}
-
-void JNIClasses::check_exception(JNIEnv *env) {
-  if (!env->ExceptionCheck()) {
-    return;
-  }
-
-  auto throwable = env->ExceptionOccurred();
-  env->ExceptionClear();
-
-  jclass c = env->FindClass("java/lang/Exception");
-  jmethodID cnstrctr = env->GetMethodID(c, "<init>", "(Ljava/lang/Throwable;)V");
-  jmethodID getMessage = env->GetMethodID(c, "getMessage", "()Ljava/lang/String;");
-
-  auto errObj = env->NewObject(c, cnstrctr, throwable);
-  auto errMsg = (jstring)env->CallObjectMethod(errObj, getMessage);
-
-  auto c_errMsg = env->GetStringUTFChars(errMsg, nullptr);
-
-  throw std::runtime_error(c_errMsg);
-}
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/jni_classes.h b/packages/android-engine/android-js-engine/src/main/cpp/jni_classes.h
deleted file mode 100644
index 9017b5c..0000000
--- a/packages/android-engine/android-js-engine/src/main/cpp/jni_classes.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CAPACITOR_BACKGROUND_RUNNER_JNI_CLASSES_H
-#define CAPACITOR_BACKGROUND_RUNNER_JNI_CLASSES_H
-
-#include <jni.h>
-
-class JNIClasses {
-public:
-    jclass context_api_class;
-    jclass js_response_class;
-    jclass js_fetch_options_class;
-    jclass capacitor_api_class;
-    jclass kv_api_class;
-    jclass notification_api_class;
-    jclass device_api_class;
-    jclass geolocation_api_class;
-
-    jmethodID context_api_fetch_method;
-    jmethodID context_api_byteArrayToString_method;
-    jmethodID context_api_randomHashCode_method;
-    jmethodID js_fetch_options_constructor;
-
-    jfieldID js_response_ok_field;
-    jfieldID js_response_status_field;
-    jfieldID js_response_url_field;
-    jfieldID js_response_data_field;
-    jfieldID js_response_error_field;
-    jfieldID capacitor_api_kv_field;
-    jfieldID capacitor_api_device_field;
-    jfieldID capacitor_api_notification_field;
-    jfieldID capacitor_api_geolocation_field;
-
-    JNIClasses(JNIEnv *env);
-
-private:
-    void check_exception(JNIEnv *env);
-};
-
-#endif //CAPACITOR_BACKGROUND_RUNNER_JNI_CLASSES_H
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/native_context.cpp b/packages/android-engine/android-js-engine/src/main/cpp/native_context.cpp
index ea34f4e..f35de36 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/native_context.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/native_context.cpp
@@ -2,83 +2,66 @@
 
 #include "context.h"
 #include "errors.h"
-#include "quickjs/quickjs.h"
 #include "runner.h"
 
-extern "C" JNIEXPORT jlong JNICALL Java_io_ionic_android_1js_1engine_Context_initContext(JNIEnv *env, jobject thiz, jlong runner_ptr, jstring name) {
+extern "C" JNIEXPORT jlong JNICALL Java_io_ionic_android_1js_1engine_Context_createRunnerContext(JNIEnv *env, jobject thiz, jlong runner_ptr, jstring name) {
   auto *runner = (Runner *)runner_ptr;
-
-  auto context_api_field_id = env->GetFieldID(env->FindClass("io/ionic/android_js_engine/Context"), "api", "Lio/ionic/android_js_engine/ContextAPI;");
-
-  auto api = env->GetObjectField(thiz, context_api_field_id);
-  auto api_instance = env->NewGlobalRef(api);
-
-  auto *context = new Context(env->GetStringUTFChars(name, nullptr), runner->rt, env, api_instance);
-
-  return (jlong)(long)context;
+  return (jlong)runner->create_context(env->GetStringUTFChars(name, nullptr), env);
 }
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_destroyContext(JNIEnv *env, jobject thiz, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_destroyRunnerContext(JNIEnv *env, jobject thiz, jlong runner_ptr, jlong ptr) {
+  auto *runner = (Runner *)runner_ptr;
   auto *ctx = (Context *)ptr;
-  delete ctx;
+
+  runner->destroy_context(ctx->name);
 }
 extern "C" JNIEXPORT jstring JNICALL Java_io_ionic_android_1js_1engine_Context_evaluate(JNIEnv *env, jobject thiz, jlong ptr, jstring code, jboolean ret_value) {
   auto *ctx = (Context *)ptr;
 
   const char *c_code = env->GetStringUTFChars(code, nullptr);
-
   auto value = ctx->evaluate(c_code, (bool)ret_value);
 
-  if (check_and_throw_js_exception(env, ctx->ctx, value)) {
+  if (throw_js_exception_in_jvm(env, ctx->qjs_context, value)) {
+    JS_FreeValue(ctx->qjs_context, value);
     return nullptr;
   }
 
-  const char *json_string = JS_ToCString(ctx->ctx, value);
+  const char *json_string = JS_ToCString(ctx->qjs_context, value);
   auto *j_json_string = env->NewStringUTF(json_string);
 
-  JS_FreeCString(ctx->ctx, json_string);
-  JS_FreeValue(ctx->ctx, value);
+  JS_FreeCString(ctx->qjs_context, json_string);
+  JS_FreeValue(ctx->qjs_context, value);
 
   return j_json_string;
 }
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_start(JNIEnv *env, jobject thiz, jlong ptr) {
-  auto *ctx = (Context *)ptr;
-  ctx->start_run_loop();
-}
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_stop(JNIEnv *env, jobject thiz, jlong ptr) {
-  auto *ctx = (Context *)ptr;
-  ctx->stop_run_loop();
+extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_registerGlobalFunction(JNIEnv *env, jobject thiz, jlong ptr, jstring function_name, jobject function) {
+  auto *context = (Context *)ptr;
+
+  const auto *c_function_name = env->GetStringUTFChars(function_name, nullptr);
+  context->register_function(c_function_name, env->NewGlobalRef(function));
+
+  env->ReleaseStringUTFChars(function_name, c_function_name);
 }
 extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_dispatchEvent(JNIEnv *env, jobject thiz, jlong ptr, jstring event, jstring details) {
-  auto *ctx = (Context *)ptr;
+  auto *context = (Context *)ptr;
 
   const char *c_event = env->GetStringUTFChars(event, nullptr);
   const char *c_details_json = env->GetStringUTFChars(details, nullptr);
 
-  JSValue details_obj = ctx->parseJSON(c_details_json);
+  auto details_obj = JS_ParseJSON(context->qjs_context, c_details_json, strlen(c_details_json), "<details>");
 
-  JSValue value = ctx->dispatch_event(c_event, details_obj);
-  JS_FreeValue(ctx->ctx, details_obj);
+  auto value = context->dispatch_event(c_event, details_obj);
+  JS_FreeValue(context->qjs_context, details_obj);
 
   env->ReleaseStringUTFChars(event, c_event);
   env->ReleaseStringUTFChars(details, c_details_json);
 
-  if (check_and_throw_js_exception(env, ctx->ctx, value)) {
-    return;
-  }
+  throw_js_exception_in_jvm(env, context->qjs_context, value);
 
-  JS_FreeValue(ctx->ctx, value);
-}
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_registerGlobalFunction(JNIEnv *env, jobject thiz, jlong ptr, jstring function_name, jobject function) {
-  auto c_function_name = env->GetStringUTFChars(function_name, nullptr);
-
-  auto *ctx = (Context *)ptr;
-  ctx->register_function(c_function_name, env->NewGlobalRef(function));
-
-  env->ReleaseStringUTFChars(function_name, c_function_name);
+  JS_FreeValue(context->qjs_context, value);
 }
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_initCapacitorAPI(JNIEnv *env, jobject thiz, jlong ptr, jobject api) {
+extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Context_setCapacitorAPI(JNIEnv *env, jobject thiz, jlong ptr, jobject api) {
   auto *ctx = (Context *)ptr;
+  auto *api_instance = env->NewGlobalRef(api);
 
-  auto api_instance = env->NewGlobalRef(api);
   ctx->init_capacitor_api(api_instance);
 }
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/native_runner.cpp b/packages/android-engine/android-js-engine/src/main/cpp/native_runner.cpp
index 6a6e7ce..a531316 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/native_runner.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/native_runner.cpp
@@ -4,14 +4,17 @@
 
 extern "C" JNIEXPORT jlong JNICALL Java_io_ionic_android_1js_1engine_Runner_initRunner(JNIEnv *env, jobject thiz) {
   auto *runner = new Runner();
-  runner->start_run_loop();
   return (jlong)(long)runner;
 }
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Runner_destroyRunner(JNIEnv *env, jobject thiz, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Runner_startRunner(JNIEnv *env, jobject thiz, jlong ptr) {
   auto *runner = (Runner *)ptr;
-  delete runner;
+  runner->start();
+}
+extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Runner_stopRunner(JNIEnv *env, jobject thiz, jlong ptr) {
+  auto *runner = (Runner *)ptr;
+  runner->stop();
 }
-extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Runner_stopRunLoop(JNIEnv *env, jobject thiz, jlong ptr) {
+extern "C" JNIEXPORT void JNICALL Java_io_ionic_android_1js_1engine_Runner_destroyRunner(JNIEnv *env, jobject thiz, jlong ptr) {
   auto *runner = (Runner *)ptr;
-  runner->stop_run_loop();
+  delete runner;
 }
\ No newline at end of file
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.c b/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.c
index 706e2cb..22ff4b9 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.c
+++ b/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.c
@@ -80,7 +80,7 @@
 
 
 /* dump object free */
-//#define DUMP_FREE
+// #define DUMP_FREE 1
 //#define DUMP_CLOSURE
 /* dump the bytecode of the compiled functions: combination of bits
    1: dump pass 3 final byte code
@@ -96,7 +96,7 @@
 /* dump objects freed by the garbage collector */
 //#define DUMP_GC_FREE
 /* dump objects leaking when freeing the runtime */
-#define DUMP_LEAKS  0
+#define DUMP_LEAKS  1
 /* dump memory usage before running the garbage collector */
 //#define DUMP_MEM
 //#define DUMP_OBJECTS    /* dump objects in JS_FreeContext */
@@ -5489,7 +5489,7 @@ void __JS_FreeValueRT(JSRuntime *rt, JSValue v)
 
     switch(tag) {
     case JS_TAG_STRING:
-        {
+        {    
             JSString *p = JS_VALUE_GET_STRING(v);
             if (p->atom_type) {
                 JS_FreeAtomStruct(rt, p);
@@ -51187,6 +51187,14 @@ JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
                                         buf, free_func, opaque, FALSE);
 }
 
+JSValue JS_NewUInt8Array(JSContext *ctx, JSValueConst arrayBuffer, int offset, int length)
+{
+    JSValue offsetValue = JS_NewInt32(ctx, offset);
+    JSValue lengthValue = JS_NewInt32(ctx, length);
+    JSValue args[] = {arrayBuffer, offsetValue, lengthValue};
+    return js_typed_array_constructor(ctx, arrayBuffer, 3, args, JS_CLASS_UINT8_ARRAY);
+}
+
 /* create a new ArrayBuffer of length 'len' and copy 'buf' to it */
 JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len)
 {
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.h b/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.h
index 084729c..85f51cf 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/quickjs/quickjs.h
@@ -821,6 +821,7 @@ typedef void JSFreeArrayBufferDataFunc(JSRuntime *rt, void *opaque, void *ptr);
 JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
                           JSFreeArrayBufferDataFunc *free_func, void *opaque,
                           JS_BOOL is_shared);
+JSValue JS_NewUInt8Array(JSContext *ctx, JSValueConst arrayBuffer, int offset, int length);
 JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len);
 void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj);
 uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValueConst obj);
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/runner.cpp b/packages/android-engine/android-js-engine/src/main/cpp/runner.cpp
index 3eaaf1d..36e0c74 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/runner.cpp
+++ b/packages/android-engine/android-js-engine/src/main/cpp/runner.cpp
@@ -1,37 +1,74 @@
 #include "runner.h"
 
+#include "api/api_console.h"
+
 Runner::Runner() {
   this->rt = JS_NewRuntime();
-  JS_SetCanBlock(rt, 1);
+  JS_SetCanBlock(rt, 0);
   JS_SetMaxStackSize(rt, 0);
+
+  this->log_debug("created runner");
 }
 
 Runner::~Runner() {
-  this->stop_run_loop();
+  this->log_debug("destroying runner");
+
+  this->stop();
+
+  if (!this->contexts.empty()) {
+    for (const auto &kv : this->contexts) {
+      this->destroy_context(kv.first);
+    }
+  }
+
+  this->contexts.clear();
+
+  this->log_debug("freeing runtime");
+
   JS_FreeRuntime(this->rt);
   this->rt = nullptr;
+
+  this->log_debug("destroyed runner");
 }
 
-void Runner::start_run_loop() {
-  this->end_run_loop = false;
+void Runner::start() {
+  this->log_debug("starting runner run loop...");
 
-  this->run_loop_thread = std::thread([this] { run_loop(); });
-  this->run_loop_thread.detach();
+  this->run_loop_started = true;
+  this->stop_run_loop = false;
 
-  this->run_loop_stopped = false;
+  this->run_loop();
 }
 
-void Runner::stop_run_loop() {
-  if (this->end_run_loop) {
+void Runner::stop() {
+  if (this->stop_run_loop) {
     return;
   }
 
-  this->run_loop_mutex.lock();
-  this->end_run_loop = true;
-  this->run_loop_mutex.unlock();
+  this->stop_run_loop = true;
+
+  while (this->run_loop_started) {
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+  }
+
+  this->log_debug("stopped runner run loop");
+}
+
+long Runner::create_context(std::string name, JNIEnv *env) {
+  auto *context = new Context(name, this->rt, env);
+  this->contexts.insert_or_assign(name, context);
+
+  return (long)context;
+}
+
+void Runner::destroy_context(std::string name) {
+  try {
+    this->log_debug("try to destroy context " + name);
+    auto *context = this->contexts.at(name);
+    delete context;
 
-  while (!this->run_loop_stopped) {
-    std::this_thread::sleep_for(std::chrono::milliseconds(500));
+    this->contexts.erase(name);
+  } catch (std::exception &ex) {
   }
 }
 
@@ -39,31 +76,31 @@ void Runner::run_loop() {
   JSContext *job_ctx;
 
   for (;;) {
-    this->run_loop_mutex.lock();
-    if (this->end_run_loop && !JS_IsJobPending(this->rt)) {
-      this->run_loop_mutex.unlock();
+    if (this->stop_run_loop && !JS_IsJobPending(this->rt)) {
       break;
     }
-    this->run_loop_mutex.unlock();
 
-    if (this->rt == nullptr) {
-      this->run_loop_mutex.lock();
-      this->end_run_loop = true;
-      this->run_loop_mutex.unlock();
-      break;
-    }
+    if (JS_IsJobPending(this->rt)) {
+      int const status = JS_ExecutePendingJob(this->rt, &job_ctx);
+      if (status < 0) {
+        auto exception_val = JS_GetException(job_ctx);
+        auto err_message = JS_GetPropertyStr(job_ctx, exception_val, "message");
+        const char *err_str = JS_ToCString(job_ctx, err_message);
+
+        this->log_debug(std::string(err_str));
 
-    int status = JS_ExecutePendingJob(this->rt, &job_ctx);
-    if (status < 0) {
-      JSValue exception_val = JS_GetException(job_ctx);
-      JSValue err_message = JS_GetPropertyStr(job_ctx, exception_val, "message");
-      const char *err_str = JS_ToCString(job_ctx, err_message);
+        JS_FreeValue(job_ctx, exception_val);
+        JS_FreeCString(job_ctx, err_str);
+        JS_FreeValue(job_ctx, err_message);
+      }
+    }
 
-      JS_FreeValue(job_ctx, exception_val);
-      JS_FreeCString(job_ctx, err_str);
-      JS_FreeValue(job_ctx, err_message);
+    for (const auto &kv : this->contexts) {
+      kv.second->run_loop();
     }
   }
 
-  this->run_loop_stopped = true;
-}
\ No newline at end of file
+  this->run_loop_started = false;
+}
+
+void Runner::log_debug(const std::string &msg) { write_to_logcat(ANDROID_LOG_DEBUG, "[Runner]", msg.c_str()); }
diff --git a/packages/android-engine/android-js-engine/src/main/cpp/runner.h b/packages/android-engine/android-js-engine/src/main/cpp/runner.h
index 81c3c00..5189f30 100644
--- a/packages/android-engine/android-js-engine/src/main/cpp/runner.h
+++ b/packages/android-engine/android-js-engine/src/main/cpp/runner.h
@@ -1,29 +1,37 @@
 #ifndef CAPACITOR_BACKGROUND_RUNNER_RUNNER_H
 #define CAPACITOR_BACKGROUND_RUNNER_RUNNER_H
 
+#include <string>
+#include <unordered_map>
+#include <queue>
 #include <thread>
 
-#include "quickjs/quickjs.h"
+#include <android/log.h>
+
+#include "./quickjs/quickjs.h"
+#include "context.h"
 
 class Runner {
 public:
     JSRuntime *rt;
+    std::unordered_map<std::string, Context*> contexts;
 
     Runner();
     ~Runner();
 
-    void start_run_loop();
-    void stop_run_loop();
+    void start();
+    void stop();
 
-private:
-    std::thread run_loop_thread;
-    std::mutex run_loop_mutex;
+    long create_context(std::string name, JNIEnv *env);
+    void destroy_context(std::string name);
 
-    bool run_loop_stopped;
-    bool end_run_loop;
+private:
+    bool run_loop_started;
+    bool stop_run_loop;
 
     void run_loop();
-};
 
+    void log_debug(const std::string& msg);
+};
 
 #endif //CAPACITOR_BACKGROUND_RUNNER_RUNNER_H
diff --git a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Context.kt b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Context.kt
index 38304a1..3219446 100644
--- a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Context.kt
+++ b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Context.kt
@@ -4,66 +4,49 @@ import io.ionic.android_js_engine.api.CapacitorAPI
 import org.json.JSONObject
 
 class Context(name: String, runnerPtr: Long) {
-    private val ptr: Long?
-    private val name: String
-    private val api: ContextAPI
-    private var capacitorAPI: CapacitorAPI?
+    val name: String
+    private val runnerPtr: Long
+
+    private var ptr: Long? = null
 
     init {
         System.loadLibrary("android_js_engine")
-
-        this.api = ContextAPI()
-        this.capacitorAPI = null
         this.name = name
-        this.ptr = initContext(runnerPtr, name)
-    }
-
-    external fun initContext(runnerPtr: Long, name: String): Long
-    external fun destroyContext(ptr: Long)
-    external fun evaluate(ptr: Long, code: String, retValue: Boolean): String
-    external fun start(ptr: Long)
-    external fun stop(ptr: Long)
-    external fun dispatchEvent(ptr: Long, event: String, details: String)
-    external fun registerGlobalFunction(ptr: Long, functionName: String, function: JSFunction)
-    external fun initCapacitorAPI(ptr: Long, api: CapacitorAPI)
-
-    fun start() {
-        val ptr = this.ptr ?: throw Exception("context pointer is null")
-        start(ptr)
+        this.runnerPtr = runnerPtr
+        this.ptr = createRunnerContext(runnerPtr, name)
     }
 
-    fun stop() {
-        val ptr = this.ptr ?: throw Exception("context pointer is null")
-        stop(ptr)
-    }
+    private external fun createRunnerContext(runnerPtr: Long, name: String): Long
+    private external fun destroyRunnerContext(runnerPtr: Long, ptr: Long)
+    private external fun evaluate(ptr: Long, code: String, retValue: Boolean): String
+    private external fun registerGlobalFunction(ptr: Long, functionName: String, function: JSFunction)
+    private external fun dispatchEvent(ptr: Long, event: String, details: String)
+    private external fun setCapacitorAPI(ptr: Long, api: CapacitorAPI)
 
     fun execute(code: String, returnValue: Boolean = false): JSValue {
-        val ptr = this.ptr ?: throw Exception("context pointer is null")
+        val ptr = this.ptr ?: throw EngineErrors.ContextException("pointer is nil")
         val jsonString = this.evaluate(ptr, code, returnValue)
 
         return JSValue(jsonString)
     }
 
-    fun dispatchEvent(event: String, details: JSONObject) {
-        val ptr = this.ptr ?: throw Exception("context pointer is null")
-
-        this.dispatchEvent(ptr, event, details.toString(0))
-    }
-
     fun registerFunction(funcName: String, func: JSFunction) {
-        val ptr = this.ptr ?: throw Exception("context pointer is null")
+        val ptr = this.ptr ?: throw EngineErrors.ContextException("pointer is nil")
         this.registerGlobalFunction(ptr, funcName, func)
     }
 
+    fun dispatchEvent(event: String, details: JSONObject) {
+        val ptr = this.ptr ?: throw EngineErrors.ContextException("pointer is nil")
+        this.dispatchEvent(ptr, event, details.toString(0))
+    }
+
     fun setCapacitorAPI(capAPI: CapacitorAPI) {
-        val ptr = this.ptr ?: throw Exception("context pointer is null")
-        this.capacitorAPI = capAPI
-        this.initCapacitorAPI(ptr, this.capacitorAPI!!)
+        val ptr = this.ptr ?: throw EngineErrors.ContextException("pointer is nil")
+        this.setCapacitorAPI(ptr, capAPI)
     }
 
-    fun destroy() {
-        val ptr = this.ptr ?: return
-        this.stop()
-        this.destroyContext(ptr)
+    internal fun destroy() {
+        val contextPtr = this.ptr ?: throw EngineErrors.ContextException("pointer is nil")
+        destroyRunnerContext(runnerPtr, contextPtr)
     }
 }
diff --git a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/ContextAPI.kt b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/ContextAPI.kt
deleted file mode 100644
index 3bf488d..0000000
--- a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/ContextAPI.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package io.ionic.android_js_engine
-
-import java.io.BufferedInputStream
-import java.io.BufferedOutputStream
-import java.lang.Exception
-import java.net.HttpURLConnection
-import java.net.URL
-import java.nio.charset.Charset
-import java.security.SecureRandom
-import java.util.UUID
-import kotlin.math.abs
-
-class ContextAPI {
-    // Crypto
-    fun cryptoRandomUUID(): String {
-        val random = UUID.randomUUID()
-        return random.toString()
-    }
-
-    fun cryptoGetRandom(size: Int): ByteArray {
-        val random = SecureRandom()
-        val arr = ByteArray(size)
-
-        random.nextBytes(arr)
-
-        return arr
-    }
-
-    fun randomHashCode(): Int {
-        return abs(cryptoRandomUUID().hashCode())
-    }
-
-    fun stringToByteArray(str: String): ByteArray {
-        return str.toByteArray(Charset.forName("UTF-8"))
-    }
-
-    fun byteArrayToString(arr: ByteArray, encoding: String): String {
-        val enc = getCharset(encoding)
-        return arr.toString(enc)
-    }
-
-    fun getCharset(encoding: String): Charset {
-        if (encoding == "utf-16be") {
-            return Charsets.UTF_16BE
-        }
-
-        if (encoding == "utf-16le") {
-            return Charsets.UTF_16LE
-        }
-
-        if (encoding == "utf-8") {
-            return Charsets.UTF_8
-        }
-
-        return Charset.forName(encoding)
-    }
-
-    fun fetch(urlStr: String, options: JSFetchOptions?): JSResponse {
-        val url = URL(urlStr)
-        val connection = url.openConnection() as HttpURLConnection
-
-        try {
-            if (options != null) {
-                connection.requestMethod = options.httpMethod
-
-                options.headers.forEach {
-                    connection.setRequestProperty(it.key, it.value)
-                }
-
-                if (options.body != null) {
-                    connection.doOutput = true
-                    connection.setChunkedStreamingMode(0)
-
-                    val output = BufferedOutputStream(connection.outputStream)
-                    output.write(options.body)
-                    output.flush()
-                }
-            }
-
-            val input = BufferedInputStream(connection.inputStream)
-            val bodyBytes = input.readBytes()
-
-            return JSResponse(connection.responseCode, connection.url.toString(), bodyBytes, null)
-        } catch (ex: Exception) {
-            print(ex.message)
-            return JSResponse(-1, urlStr, null, ex.message)
-        } finally {
-            connection.disconnect()
-        }
-    }
-}
diff --git a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/EngineErrors.kt b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/EngineErrors.kt
index 7c25912..cbeaf88 100644
--- a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/EngineErrors.kt
+++ b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/EngineErrors.kt
@@ -2,4 +2,6 @@ package io.ionic.android_js_engine
 
 sealed class EngineErrors(message: String) : Exception(message) {
     data class JavaScriptException(val details: String) : EngineErrors("JS exception: $details")
+    data class RunnerException(val details: String) : EngineErrors("Runner exception: $details")
+    data class ContextException(val details: String) : EngineErrors("Context exception: $details")
 }
diff --git a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/NativeLib.kt b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/NativeLib.kt
deleted file mode 100644
index 808ddf4..0000000
--- a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/NativeLib.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package io.ionic.android_js_engine
-
-class NativeLib {
-
-    /**
-     * A native method that is implemented by the 'android_js_engine' native library,
-     * which is packaged with this application.
-     */
-    external fun stringFromJNI(): String
-
-    companion object {
-        // Used to load the 'android_js_engine' library on application startup.
-        init {
-            System.loadLibrary("android_js_engine")
-        }
-    }
-}
diff --git a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Runner.kt b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Runner.kt
index 69f9907..e5d07ed 100644
--- a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Runner.kt
+++ b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/Runner.kt
@@ -1,44 +1,85 @@
 package io.ionic.android_js_engine
 
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
 class Runner {
-    private val ptr: Long?
     private val contexts: HashMap<String, Context> = HashMap()
 
+    private var ptr: Long? = null
+    private var job: Job? = null
+
     init {
         System.loadLibrary("android_js_engine")
-        this.ptr = this.initRunner()
+
+        this.ptr = initRunner()
     }
 
     private external fun initRunner(): Long
-    private external fun stopRunLoop(ptr: Long)
+    private external fun startRunner(ptr: Long)
+    private external fun stopRunner(ptr: Long)
     private external fun destroyRunner(ptr: Long)
 
     fun createContext(name: String): Context {
-        val runnerPtr = this.ptr ?: throw Exception("runner pointer is null")
-        val newCtx = Context(name, runnerPtr)
+        val runnerPtr = this.ptr ?: throw EngineErrors.RunnerException("pointer is nil")
+
+        if (contexts.containsKey(name)) {
+            throw EngineErrors.RunnerException("context with name $name already exists")
+        }
 
-        contexts[name] = newCtx
+        val context = Context(name, runnerPtr)
 
-        return newCtx
+        contexts[name] = context
+
+        return context
     }
 
     fun destroyContext(name: String) {
-        val ctx = contexts[name] ?: return
-        ctx.destroy()
+        val runnerPtr = this.ptr ?: throw EngineErrors.RunnerException("pointer is nil")
+
+        val context = contexts[name] ?: return
+        context.destroy()
+
         this.contexts.remove(name)
     }
 
+    fun start() {
+        val runnerPtr = this.ptr ?: throw EngineErrors.RunnerException("pointer is nil")
+        this.job = GlobalScope.launch {
+            startRunner(runnerPtr)
+            print("Runner Stopped")
+        }
+        Thread.sleep(20)
+    }
+
+    fun stop() {
+        val runnerPtr = this.ptr ?: throw EngineErrors.RunnerException("pointer is nil")
+        this.stopRunner(runnerPtr)
+        if (this.job != null) {
+            this.job?.cancel()
+            this.job = null
+        }
+    }
+
     fun destroy() {
-        val runnerPtr = this.ptr ?: return
+        val runnerPtr = this.ptr ?: throw EngineErrors.RunnerException("pointer is nil")
 
-        this.stopRunLoop(runnerPtr)
+        this.stop()
 
         if (this.contexts.isNotEmpty()) {
-            this.contexts.forEach { (_, ctx) ->
-                ctx.destroy()
+            val allKeys = mutableListOf<String>()
+            this.contexts.keys.forEach {
+                allKeys.add(it)
+            }
+
+            allKeys.forEach {
+                destroyContext(it)
             }
+
+            this.contexts.clear()
         }
 
-        this.destroyRunner(runnerPtr)
+        destroyRunner(runnerPtr)
     }
 }
diff --git a/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/WebAPI.kt b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/WebAPI.kt
new file mode 100644
index 0000000..2dcdb50
--- /dev/null
+++ b/packages/android-engine/android-js-engine/src/main/java/io/ionic/android_js_engine/WebAPI.kt
@@ -0,0 +1,98 @@
+package io.ionic.android_js_engine
+
+import java.io.BufferedInputStream
+import java.io.BufferedOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
+import java.nio.charset.Charset
+import java.security.SecureRandom
+import java.util.UUID
+import kotlin.math.abs
+
+class WebAPI {
+    companion object {
+        @JvmStatic
+        fun cryptoRandomUUID(): String {
+            val random = UUID.randomUUID()
+            return random.toString()
+        }
+
+        @JvmStatic
+        fun cryptoGetRandom(size: Int): ByteArray {
+            val random = SecureRandom()
+            val arr = ByteArray(size)
+
+            random.nextBytes(arr)
+
+            return arr
+        }
+
+        @JvmStatic
+        fun randomHashCode(): Int {
+            return abs(cryptoRandomUUID().hashCode())
+        }
+
+        @JvmStatic
+        fun stringToByteArray(str: String): ByteArray {
+            return str.toByteArray(Charset.forName("UTF-8"))
+        }
+
+        @JvmStatic
+        fun byteArrayToString(arr: ByteArray, encoding: String): String {
+            val enc = getCharset(encoding)
+            return arr.toString(enc)
+        }
+
+        @JvmStatic
+        fun getCharset(encoding: String): Charset {
+            if (encoding == "utf-16be") {
+                return Charsets.UTF_16BE
+            }
+
+            if (encoding == "utf-16le") {
+                return Charsets.UTF_16LE
+            }
+
+            if (encoding == "utf-8") {
+                return Charsets.UTF_8
+            }
+
+            return Charset.forName(encoding)
+        }
+
+        @JvmStatic
+        fun fetch(urlStr: String, options: JSFetchOptions?): JSResponse {
+            val url = URL(urlStr)
+            val connection = url.openConnection() as HttpURLConnection
+
+            try {
+                if (options != null) {
+                    connection.requestMethod = options.httpMethod
+
+                    options.headers.forEach {
+                        connection.setRequestProperty(it.key, it.value)
+                    }
+
+                    if (options.body != null) {
+                        connection.doOutput = true
+                        connection.setChunkedStreamingMode(0)
+
+                        val output = BufferedOutputStream(connection.outputStream)
+                        output.write(options.body)
+                        output.flush()
+                    }
+                }
+
+                val input = BufferedInputStream(connection.inputStream)
+                val bodyBytes = input.readBytes()
+
+                return JSResponse(connection.responseCode, connection.url.toString(), bodyBytes, null)
+            } catch (ex: Exception) {
+                print(ex.message)
+                return JSResponse(-1, urlStr, null, ex.message)
+            } finally {
+                connection.disconnect()
+            }
+        }
+    }
+}
diff --git a/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/ContextTests.kt b/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/ContextTests.kt
index fccb5c2..7e5903f 100644
--- a/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/ContextTests.kt
+++ b/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/ContextTests.kt
@@ -189,24 +189,63 @@ class ContextTests {
     }
 
     @Test
-    fun testAPI_Crypto() {
+    fun testErrorHandling() {
         val runner = Runner()
         val context = runner.createContext("io.ionic.android_js_engine")
 
-        var value = context.execute("const array = new Uint32Array(10);  crypto.getRandomValues(array); array;", true)
-        assertEquals(10, value.getJSONObject()?.length())
+        val throwingCodeEx = assertThrows(Exception::class.java) {
+            context.execute("() => { throw new Error('this method has an error'); }();")
+        }
+
+        var localizedMessage = throwingCodeEx.localizedMessage ?: ""
+        assertTrue(localizedMessage.contains("JS exception"))
+
+        val badCodeEx = assertThrows(Exception::class.java) {
+            // badly formed code
+            context.execute("addEventListener(")
+        }
+
+        localizedMessage = badCodeEx.localizedMessage ?: ""
+        assertTrue(localizedMessage.contains("JS exception"))
+
+
+        val throwingEventEx = assertThrows(java.lang.Exception::class.java) {
+            context.execute("addEventListener('myThrowingEvent', () => { throw new Error('this event throws an error') })")
+            context.dispatchEvent("myThrowingEvent", JSONObject())
+        }
+
+        localizedMessage = throwingEventEx.localizedMessage ?: ""
+        assertTrue(localizedMessage.contains("JS exception"))
+
+        // testing handling JVM exceptions
+        class ExceptionCallback : JSFunction(jsName = "exceptionCallback") {
+            override fun run() {
+                super.run()
+                throw Exception("this is a problem from the JVM")
+            }
+        }
+
+        val callback = ExceptionCallback()
+
+        context.registerFunction("exceptionCallback", callback)
+
+        val throwingJVMEventEx = assertThrows(java.lang.Exception::class.java) {
+            context.execute("addEventListener('myThrowingJVMEvent', () => { exceptionCallback(); })")
+            context.dispatchEvent("myThrowingJVMEvent", JSONObject())
+        }
+
+        localizedMessage = throwingJVMEventEx.localizedMessage ?: ""
+        assertTrue(localizedMessage.contains("JS exception"))
 
-        value = context.execute("crypto.randomUUID();", true)
-        assertEquals(36, value.getStringValue()?.length)
         runner.destroy()
     }
 
-    // TODO: Flakey test - intermittent unfreed structs
     @Test
     fun testAPI_SetTimeout() {
         val runner = Runner()
+        runner.start()
+
         val context = runner.createContext("io.ionic.android_js_engine")
-        context.start()
 
         val timeoutFuture1 = CompletableFuture<Int>()
         val timeoutFuture2 = CompletableFuture<Int>()
@@ -254,15 +293,16 @@ class ContextTests {
             assertTrue(true)
         }
 
-        context.stop()
+        runner.stop()
         runner.destroy()
     }
 
     @Test
     fun testAPI_SetInterval() {
         val runner = Runner()
+        runner.start()
+
         val context = runner.createContext("io.ionic.android_js_engine")
-        context.start()
 
         var calls = 0;
 
@@ -288,7 +328,20 @@ class ContextTests {
         Thread.sleep(3000)
         assertEquals(4, calls)
 
-        context.stop()
+        runner.stop()
+        runner.destroy()
+    }
+
+    @Test
+    fun testAPI_Crypto() {
+        val runner = Runner()
+        val context = runner.createContext("io.ionic.android_js_engine")
+
+        var value = context.execute("const array = new Uint32Array(10);  crypto.getRandomValues(array); array;", true)
+        assertEquals(10, value.getJSONObject()?.length())
+
+        value = context.execute("crypto.randomUUID();", true)
+        assertEquals(36, value.getStringValue()?.length)
         runner.destroy()
     }
 
@@ -326,20 +379,18 @@ class ContextTests {
     @Test
     fun testAPI_Fetch() {
         val runner = Runner()
+        runner.start()
+
         val context = runner.createContext("io.ionic.android_js_engine")
-        context.start()
 
-        val future1 = CompletableFuture<Int>()
+        val future1 = CompletableFuture<JSONObject?>()
         val future2 = CompletableFuture<Int>()
-        val future3 = CompletableFuture<Int>()
+        val future3 = CompletableFuture<JSONObject?>()
 
         class SuccessCallback : JSFunction(jsName = "successCallback") {
-            public var calls: Int = 0
             override fun run() {
                 super.run()
-                calls++
-                print("called success callback")
-                future1.complete(calls)
+                future1.complete(this.args)
             }
         }
 
@@ -353,11 +404,9 @@ class ContextTests {
         }
 
         class OptionsSuccessCallback : JSFunction(jsName = "successCallback2") {
-            public var calls: Int = 0
             override fun run() {
                 super.run()
-                calls++
-                future3.complete(calls)
+                future3.complete(this.args)
             }
         }
 
@@ -372,8 +421,29 @@ class ContextTests {
         val basicFetchExample = """
             fetch('https://jsonplaceholder.typicode.com/todos/1')
                 .then(response => response.json())
-                .then(json => { console.log(JSON.stringify(json)); successCallback(); })
-                .catch(err => { console.error(err);  successCallback(); });
+                .then(json => { successCallback(json); })
+                .catch(err => { console.error(err); });
+        """.trimIndent()
+
+        val basicFetchWithTextResponseExample = """
+            fetch('https://jsonplaceholder.typicode.com/todos/1')
+                .then(response => response.text())
+                .then(text => { console.log(text); })
+                .catch(err => { console.error(err); });
+        """.trimIndent()
+
+        val basicFetchWithArrayBufferResponseExample = """
+            fetch('https://jsonplaceholder.typicode.com/todos/1')
+                .then(response => response.arrayBuffer())
+                .then(buf => { console.log(buf.byteLength); })
+                .catch(err => { console.error(err); });
+        """.trimIndent()
+
+        val basicFetchWithBlobResponseExample = """
+            fetch('https://jsonplaceholder.typicode.com/todos/1')
+                .then(response => response.blob())
+                .then(blob => { console.log(blob.size); })
+                .catch(err => { console.error(err); });
         """.trimIndent()
 
         val fetchFailureExample = """
@@ -395,12 +465,19 @@ class ContextTests {
             })
             .catch(err => { console.error(err); })
             .then(response => response.json())
-            .then(json => { console.log(JSON.stringify(json)); successCallback2(); })
+            .then(json => { successCallback2(json); })
         """.trimIndent()
 
         context.execute(basicFetchExample)
 
-        assertEquals(1, future1.get(5, TimeUnit.SECONDS))
+        val jsonResponse1 = future1.get(5, TimeUnit.SECONDS);
+        assertEquals("delectus aut autem", jsonResponse1?.getString("title"))
+
+        context.execute(basicFetchWithTextResponseExample)
+
+        context.execute(basicFetchWithArrayBufferResponseExample)
+
+//        context.execute(basicFetchWithBlobResponseExample)
 
         context.execute(fetchFailureExample)
 
@@ -408,39 +485,30 @@ class ContextTests {
 
         context.execute(fetchWithOptionsExample)
 
-        assertEquals(1, future3.get(5, TimeUnit.SECONDS))
+        val jsonResponse2 = future3.get(5, TimeUnit.SECONDS)
+        assertEquals("bar", jsonResponse2?.getString("body"))
 
-        context.stop()
+        runner.stop()
         runner.destroy()
 
     }
 
-    @Test
-    fun testErrorHandling() {
-        val runner = Runner()
-        val context = runner.createContext("io.ionic.android_js_engine")
-
-        val throwingCodeEx = assertThrows(Exception::class.java) {
-            context.execute("() => { throw new Error('this method has an error'); }();")
-        }
-
-        assertTrue(throwingCodeEx.localizedMessage.contains("JS exception"))
-
-        val badCodeEx = assertThrows(Exception::class.java) {
-            // badly formed code
-            context.execute("addEventListener(")
-        }
-
-        assertTrue(badCodeEx.localizedMessage.contains("JS exception"))
-
-
-        val throwingEventEx = assertThrows(java.lang.Exception::class.java) {
-            context.execute("addEventListener('myThrowingEvent', () => { throw new Error('this event throws an error') })")
-            context.dispatchEvent("myThrowingEvent", JSONObject())
-        }
-
-        assertTrue(throwingEventEx.localizedMessage.contains("JS exception"))
-
-        runner.destroy()
-    }
+//    @Test
+//    fun testAPI_Blob() {
+//        val runner = Runner()
+//        val context = runner.createContext("io.ionic.android_js_engine")
+//
+//        val basicBlobExample = """
+//            const obj = { hello: "world" };
+//            const blob = new Blob([JSON.stringify(obj, null, 2)], {
+//              type: "application/json",
+//            });
+//            blob.text().then((text) => console.log(text));
+//
+//        """.trimIndent()
+//
+//        context.execute(basicBlobExample)
+//
+//        runner.destroy()
+//    }
 }
\ No newline at end of file
diff --git a/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/RunnerTests.kt b/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/RunnerTests.kt
new file mode 100644
index 0000000..c31c845
--- /dev/null
+++ b/packages/android-engine/app/src/androidTest/java/io/ionic/backgroundrunner/RunnerTests.kt
@@ -0,0 +1,66 @@
+package io.ionic.backgroundrunner
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.ionic.android_js_engine.JSFunction
+import io.ionic.android_js_engine.Runner
+import junit.framework.TestCase
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
+
+@RunWith(AndroidJUnit4::class)
+class RunnerTests {
+    @Test
+    fun testRunnerCreateDestroy() {
+        val runner = Runner()
+        runner.start()
+
+        runner.stop()
+        runner.destroy()
+    }
+
+    @Test
+    fun testContextCreateDestroy() {
+        val runner = Runner()
+        runner.start()
+
+        val context = runner.createContext("io.ionic.android_js_engine")
+
+        runner.destroy()
+    }
+
+    @Test
+    fun testMultipleContexts() {
+        val runner = Runner()
+        runner.start()
+
+        val count = (20..40).random()
+
+        val timeoutFuture = CompletableFuture<Int>()
+
+        class TimeoutCallback : JSFunction(jsName = "timeoutCallback") {
+            public var calls: Int = 0
+            override fun run() {
+                super.run()
+                calls++
+
+                if (calls >= count) {
+                    timeoutFuture.complete(calls)
+                }
+            }
+        }
+
+        val callback1 = TimeoutCallback()
+
+        for (i in 1..count) {
+            val context = runner.createContext("context #$i")
+            context.registerFunction("timeoutCallback", callback1)
+            context.execute("setTimeout(() => { timeoutCallback(); }, 2000)", false)
+        }
+
+        TestCase.assertEquals(count, timeoutFuture.get(5, TimeUnit.SECONDS))
+
+        runner.destroy()
+    }
+}
\ No newline at end of file
diff --git a/packages/capacitor-plugin/android/src/main/AndroidManifest.xml b/packages/capacitor-plugin/android/src/main/AndroidManifest.xml
index abe55f5..a994bcb 100644
--- a/packages/capacitor-plugin/android/src/main/AndroidManifest.xml
+++ b/packages/capacitor-plugin/android/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
diff --git a/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunner.kt b/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunner.kt
index 5cf4c07..8517bf6 100644
--- a/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunner.kt
+++ b/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunner.kt
@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit
 
 
 class BackgroundRunner(context: android.content.Context) {
-    public val config: RunnerConfig?
-    private var runner: Runner? = null
-    private var context: Context? = null
+    val config: RunnerConfig?
+
+    private var runner: Runner = Runner()
 
     companion object {
         @Volatile private var instance: BackgroundRunner? = null
@@ -36,21 +36,9 @@ class BackgroundRunner(context: android.content.Context) {
         }
     }
 
-    private val started: Boolean
-        get() {
-            return runner != null && context != null
-        }
-
     init {
         config = loadRunnerConfig(context.assets)
-    }
-
-    fun start(androidContext: android.content.Context) {
-        config ?: throw Exception("...no runner config to start")
-
-        runner = Runner()
-        context = initContext(config, androidContext)
-        context?.start()
+        runner.start()
     }
 
     fun scheduleBackgroundTask(androidContext: android.content.Context) {
@@ -85,12 +73,10 @@ class BackgroundRunner(context: android.content.Context) {
         }
     }
 
-    suspend fun execute(androidContext: android.content.Context, config: RunnerConfig, dataArgs: JSONObject = JSONObject()): JSONObject? {
-        if (!started) {
-            start(androidContext)
-        }
+    suspend fun execute(androidContext: android.content.Context, config: RunnerConfig, dataArgs: JSONObject = JSONObject(), callbackId: String? = null): JSONObject? {
+        config ?: throw Exception("...no runner config to start")
 
-        context ?: throw Exception("no loaded context for config")
+        val context = initContext(config, androidContext, callbackId)
 
         val future = MutableStateFlow<Result<JSONObject?>?>(null)
 
@@ -114,8 +100,8 @@ class BackgroundRunner(context: android.content.Context) {
 
         val resolve = ResolveCallback()
         val reject = RejectCallback()
-        context!!.registerFunction("_resolveCallback", resolve)
-        context!!.registerFunction("_rejectCallback", reject)
+        context.registerFunction("_resolveCallback", resolve)
+        context.registerFunction("_rejectCallback", reject)
 
         val args = JSONObject()
 
@@ -126,15 +112,13 @@ class BackgroundRunner(context: android.content.Context) {
         args.put("callbacks", callbacks)
         args.put("dataArgs", dataArgs)
 
-        context!!.dispatchEvent(config.event, args)
+        context.dispatchEvent(config.event, args)
 
         val finished = future.conditionalAwait {
             it != null
         }
 
-        runner?.destroy()
-
-        runner = null
+        destroyContext(config)
 
         if (finished!!.isSuccess) {
             return finished.getOrNull()
@@ -162,14 +146,17 @@ class BackgroundRunner(context: android.content.Context) {
         }
     }
 
-    private fun initContext(config: RunnerConfig, context: android.content.Context): Context {
-        runner ?: throw Exception("runner is not initialized")
-
+    private fun initContext(config: RunnerConfig, context: android.content.Context, callbackId: String?): Context {
         val srcFile = context.assets.open("public/${config.src}").bufferedReader().use {
             it.readText()
         }
 
-        val newContext  = runner!!.createContext(config.label)
+        var contextName = config.label
+        if (callbackId != null) {
+            contextName += "-$callbackId"
+        }
+
+        val newContext  = runner.createContext(contextName)
 
         val api = CapacitorAPI(config.label)
         api.initNotificationsAPI(Notifications(context))
@@ -183,4 +170,8 @@ class BackgroundRunner(context: android.content.Context) {
 
         return newContext
     }
+
+    private fun destroyContext(config: RunnerConfig) {
+        runner.destroyContext(config.label)
+    }
 }
\ No newline at end of file
diff --git a/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunnerPlugin.kt b/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunnerPlugin.kt
index ba83953..8cd1236 100644
--- a/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunnerPlugin.kt
+++ b/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/BackgroundRunnerPlugin.kt
@@ -78,7 +78,8 @@ class BackgroundRunnerPlugin: Plugin() {
                     val returnData = impl.execute(
                         this@BackgroundRunnerPlugin.context,
                         config,
-                        details
+                        details,
+                        call.callbackId
                     )
 
                     if (returnData != null) {
diff --git a/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/RunnerWorker.kt b/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/RunnerWorker.kt
index e3a652d..b6b9eb7 100644
--- a/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/RunnerWorker.kt
+++ b/packages/capacitor-plugin/android/src/main/java/io/ionic/backgroundrunner/plugin/RunnerWorker.kt
@@ -1,6 +1,7 @@
 package io.ionic.backgroundrunner.plugin;
 
 import android.content.Context
+import android.util.Log
 import androidx.work.Data
 import androidx.work.Worker
 import androidx.work.WorkerParameters
@@ -36,6 +37,8 @@ class RunnerWorker(context: Context, workerParams: WorkerParameters) : Worker(co
 
             return Result.success()
         } catch (ex: Exception) {
+            val label = this.inputData.getString("label") ?: ""
+            Log.e("[RUNNER WORKER for $label]", ex.toString())
             val data = Data.Builder()
                 .putString("error", ex.toString())
                 .build()
diff --git a/packages/capacitor-plugin/ios/Plugin/BackgroundRunner.swift b/packages/capacitor-plugin/ios/Plugin/BackgroundRunner.swift
index 25ba981..d63c77e 100644
--- a/packages/capacitor-plugin/ios/Plugin/BackgroundRunner.swift
+++ b/packages/capacitor-plugin/ios/Plugin/BackgroundRunner.swift
@@ -6,18 +6,13 @@ import JavaScriptCore
 public class BackgroundRunner {
     public static let shared = BackgroundRunner()
 
-    private var runner: Runner?
     private var config: RunnerConfig?
-
-    private var context: Context?
-
-    private var started: Bool {
-        return runner != nil && context != nil
-    }
+    private var runner = Runner()
 
     public init() {
         do {
             config = try self.loadRunnerConfig()
+            runner.start()
         } catch {
             print("could not initialize BackgroundRunner: \(error)")
         }
@@ -76,40 +71,11 @@ public class BackgroundRunner {
         }
     }
 
-    public func start() throws {
-        print("starting runner and loading contexts...")
-
-        guard let config = config else {
-            print("...no runner config to start")
-            return
-        }
-
-        self.runner = Runner()
-        context = try initContext(config: config)
-
-    }
-
-    public func stop() {
-        print("...stopping runner and removing all contexts")
-        guard let runner = runner, let config = config else {
-            return
-        }
-
-        runner.destroyContext(name: config.label)
-
-        context = nil
-        self.runner = nil
-    }
-
     public func getConfig() -> RunnerConfig? {
         return config
     }
 
-    public func dispatchEvent(event: String, inputArgs: [String: Any]?) throws {
-        if !started {
-            try start()
-        }
-
+    public func dispatchEvent(event: String, inputArgs: [String: Any]?, callbackId: String? = nil) throws {
         if let config = config {
             let waitGroup = DispatchGroup()
             waitGroup.enter()
@@ -119,7 +85,7 @@ public class BackgroundRunner {
             // swiftlint:disable:next unowned_variable_capture
             DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
                 do {
-                    _ = try self.execute(config: config, event: event, inputArgs: inputArgs)
+                    _ = try self.execute(config: config, event: event, inputArgs: inputArgs, callbackId: callbackId)
                 } catch {
                     err = error
                     print("[\(config.label)]: \(error)")
@@ -137,15 +103,9 @@ public class BackgroundRunner {
     }
 
     // swiftlint:disable:next cyclomatic_complexity function_body_length
-    public func execute(config: RunnerConfig, event: String, inputArgs: [String: Any]? = nil) throws -> [String: Any]? {
+    public func execute(config: RunnerConfig, event: String, inputArgs: [String: Any]? = nil, callbackId: String? = nil) throws -> [String: Any]? {
         do {
-            if !started {
-                try self.start()
-            }
-
-            guard let context = context else {
-                throw BackgroundRunnerPluginError.runnerError(reason: "no loaded context for config")
-            }
+            let context = try initContext(config: config, callbackId: callbackId)
 
             let waitGroup = DispatchGroup()
 
@@ -241,18 +201,19 @@ public class BackgroundRunner {
         return nil
     }
 
-    private func initContext(config: RunnerConfig) throws -> Context {
-        guard let runner = runner else {
-            throw BackgroundRunnerPluginError.runnerError(reason: "runner is not initialized")
-        }
-
+    private func initContext(config: RunnerConfig, callbackId: String?) throws -> Context {
         guard let srcFileURL = Bundle.main.url(forResource: config.src, withExtension: nil, subdirectory: "public") else {
             throw BackgroundRunnerPluginError.runnerError(reason: "source file not found")
         }
 
+        var contextName = config.label
+        if let callbackId = callbackId {
+            contextName = "\(contextName)-\(callbackId)"
+        }
+
         let srcFile = try String(contentsOf: srcFileURL)
 
-        let context = try runner.createContext(name: config.label)
+        let context = try runner.createContext(name: contextName)
 
         context.setupCapacitorAPI()
 
diff --git a/packages/capacitor-plugin/ios/Plugin/BackgroundRunnerPlugin.swift b/packages/capacitor-plugin/ios/Plugin/BackgroundRunnerPlugin.swift
index 1903a5b..27e1f69 100644
--- a/packages/capacitor-plugin/ios/Plugin/BackgroundRunnerPlugin.swift
+++ b/packages/capacitor-plugin/ios/Plugin/BackgroundRunnerPlugin.swift
@@ -70,7 +70,8 @@ public class BackgroundRunnerPlugin: CAPPlugin {
                     let result = try self.impl.execute(
                         config: config,
                         event: runnerEvent,
-                        inputArgs: details as [String: Any]
+                        inputArgs: details as [String: Any],
+                        callbackId: call.callbackId
                     )
 
                     if let result = result {
diff --git a/packages/capacitor-plugin/ios/Plugin/Context+CapacitorAPI.swift b/packages/capacitor-plugin/ios/Plugin/Context+CapacitorAPI.swift
index 0a13edd..ff83787 100644
--- a/packages/capacitor-plugin/ios/Plugin/Context+CapacitorAPI.swift
+++ b/packages/capacitor-plugin/ios/Plugin/Context+CapacitorAPI.swift
@@ -2,10 +2,10 @@ import Foundation
 
 extension Context {
     public func setupCapacitorAPI() {
-        ctx.setObject(CapacitorKVStore.self, forKeyedSubscript: "CapacitorKV" as NSString)
-        ctx.setObject(CapacitorGeolocation(context: self), forKeyedSubscript: "CapacitorGeolocation" as NSString)
-        ctx.setObject(CapacitorWatch(), forKeyedSubscript: "CapacitorWatch" as NSString)
-        ctx.setObject(CapacitorNotifications.self, forKeyedSubscript: "CapacitorNotifications" as NSString)
-        ctx.setObject(CapacitorDevice(), forKeyedSubscript: "CapacitorDevice" as NSString)
+        jsContext.setObject(CapacitorKVStore.self, forKeyedSubscript: "CapacitorKV" as NSString)
+        jsContext.setObject(CapacitorGeolocation(context: self), forKeyedSubscript: "CapacitorGeolocation" as NSString)
+        jsContext.setObject(CapacitorWatch(), forKeyedSubscript: "CapacitorWatch" as NSString)
+        jsContext.setObject(CapacitorNotifications.self, forKeyedSubscript: "CapacitorNotifications" as NSString)
+        jsContext.setObject(CapacitorDevice(), forKeyedSubscript: "CapacitorDevice" as NSString)
     }
 }
diff --git a/packages/ios-engine/Sources/RunnerEngine/Context.swift b/packages/ios-engine/Sources/RunnerEngine/Context.swift
index 0493549..857da31 100644
--- a/packages/ios-engine/Sources/RunnerEngine/Context.swift
+++ b/packages/ios-engine/Sources/RunnerEngine/Context.swift
@@ -3,37 +3,21 @@ import JavaScriptCore
 
 public class Context {
     let name: String
-    let ctx: JSContext
+    let jsContext: JSContext
 
-    private var timers = [Int: Timer]()
     private var eventListeners = [String: JSValue]()
-    private var thread: Thread!
-    private var runLoop: RunLoop?
+    private var timers = [Int: Timer]()
+    private weak var runLoop: RunLoop?
 
     // swiftlint:disable:next identifier_name
-    public init(vm: JSVirtualMachine, ctxName: String) throws {
-        guard let newCtx = JSContext(virtualMachine: vm) else {
+    public init(vm: JSVirtualMachine, contextName: String, runLoop: RunLoop) throws {
+        guard let jsContext = JSContext(virtualMachine: vm) else {
             throw EngineError.jsCoreError
         }
 
-        newCtx.name = ctxName
-
-        name = ctxName
-        ctx = newCtx
-
-        thread = Thread { [weak self] in
-            self?.runLoop = RunLoop.current
-
-            while self != nil && !self!.thread.isCancelled && self!.runLoop != nil {
-                self?.runLoop?.run(mode: .default, before: .distantFuture)
-            }
-
-            Thread.exit()
-        }
-
-        thread.name = "[\(name)] context thread"
-        thread.qualityOfService = .userInitiated
-        thread.start()
+        self.name = contextName
+        self.jsContext = jsContext
+        self.runLoop = runLoop
 
         try setupWebAPI()
     }
@@ -41,11 +25,11 @@ public class Context {
     public func execute(code: String) throws -> JSValue? {
         var thrownException: JSValue?
 
-        ctx.exceptionHandler = { _, exception in
+        jsContext.exceptionHandler = { _, exception in
             thrownException = exception
         }
 
-        let value = ctx.evaluateScript(code)
+        let value = jsContext.evaluateScript(code)
 
         if let exception = thrownException {
             throw EngineError.jsException(details: String(describing: exception))
@@ -67,14 +51,14 @@ public class Context {
                 callbacks.keys.forEach { key in
                     if key.hasPrefix("__cbr::") {
                         let funcName = key.replacingOccurrences(of: "__cbr::", with: "")
-                        callbackFunctions[funcName] = JSValue.init(object: callbacks[key], in: self.ctx)
+                        callbackFunctions[funcName] = JSValue.init(object: callbacks[key], in: self.jsContext)
                     }
                 }
             }
 
             var thrownException: JSValue?
 
-            self.ctx.exceptionHandler = { _, exception in
+            self.jsContext.exceptionHandler = { _, exception in
                 thrownException = exception
             }
 
@@ -87,7 +71,7 @@ public class Context {
             }
 
             if let dataArgs = dataArgs {
-                guard let jsDataArgs = JSValue(object: dataArgs, in: self.ctx) else {
+                guard let jsDataArgs = JSValue(object: dataArgs, in: self.jsContext) else {
                     throw EngineError.jsValueError
                 }
 
@@ -99,9 +83,9 @@ public class Context {
             if let exception = thrownException {
                 throw EngineError.jsException(details: String(describing: exception))
             }
-
         }
     }
+
     private func setupWebAPI() throws {
         let consoleObj = JSConsole(name: name)
         let addEventListenerFunc: @convention(block)(String, JSValue) -> Void = { type, listener in
@@ -123,16 +107,16 @@ public class Context {
         let newTextEncoderConst: @convention(block) () -> JSTextEncoder = JSTextEncoder.init
         let newTextDecoderConst: @convention(block) (String?, [AnyHashable: Any]?) -> JSTextDecoder = JSTextDecoder.init
 
-        ctx.setObject(consoleObj, forKeyedSubscript: "console" as NSString)
-        ctx.setObject(fetchFunc, forKeyedSubscript: "fetch" as NSString)
-        ctx.setObject(JSCrypto.self, forKeyedSubscript: "crypto" as NSString)
-        ctx.setObject(addEventListenerFunc, forKeyedSubscript: "addEventListener" as NSString)
-        ctx.setObject(setTimeoutFunc, forKeyedSubscript: "setTimeout" as NSString)
-        ctx.setObject(setIntervalFunc, forKeyedSubscript: "setInterval" as NSString)
-        ctx.setObject(clearTimeoutFunc, forKeyedSubscript: "clearTimeout" as NSString)
-        ctx.setObject(clearTimeoutFunc, forKeyedSubscript: "clearInterval" as NSString)
-        ctx.setObject(newTextEncoderConst, forKeyedSubscript: "TextEncoder" as NSString)
-        ctx.setObject(newTextDecoderConst, forKeyedSubscript: "TextDecoder" as NSString)
+        jsContext.setObject(consoleObj, forKeyedSubscript: "console" as NSString)
+        jsContext.setObject(fetchFunc, forKeyedSubscript: "fetch" as NSString)
+        jsContext.setObject(JSCrypto.self, forKeyedSubscript: "crypto" as NSString)
+        jsContext.setObject(addEventListenerFunc, forKeyedSubscript: "addEventListener" as NSString)
+        jsContext.setObject(setTimeoutFunc, forKeyedSubscript: "setTimeout" as NSString)
+        jsContext.setObject(setIntervalFunc, forKeyedSubscript: "setInterval" as NSString)
+        jsContext.setObject(clearTimeoutFunc, forKeyedSubscript: "clearTimeout" as NSString)
+        jsContext.setObject(clearTimeoutFunc, forKeyedSubscript: "clearInterval" as NSString)
+        jsContext.setObject(newTextEncoderConst, forKeyedSubscript: "TextEncoder" as NSString)
+        jsContext.setObject(newTextDecoderConst, forKeyedSubscript: "TextDecoder" as NSString)
 
     }
 
@@ -141,7 +125,9 @@ public class Context {
     }
 
     private func initTimer(callback: JSValue, timeout: Int, isInterval: Bool) -> Int {
-        let timer = Timer(timeInterval: TimeInterval(timeout / 1000), repeats: isInterval) { t in
+        let timer = Timer(timeInterval: TimeInterval(timeout / 1000), repeats: isInterval) { [weak self] t in
+            guard let self = self else { return }
+
             callback.call(withArguments: [])
             if !isInterval {
                 let timerId = Int(Int32.init(truncatingIfNeeded: t.hashValue))
@@ -155,9 +141,6 @@ public class Context {
         if let runLoop = self.runLoop {
             runLoop.add(timer, forMode: .default)
             runLoop.add(timer, forMode: .common)
-        } else {
-            RunLoop.current.add(timer, forMode: .default)
-            RunLoop.current.add(timer, forMode: .common)
         }
 
         return timerId
diff --git a/packages/ios-engine/Sources/RunnerEngine/Errors.swift b/packages/ios-engine/Sources/RunnerEngine/Errors.swift
index 72071cb..cdac47c 100644
--- a/packages/ios-engine/Sources/RunnerEngine/Errors.swift
+++ b/packages/ios-engine/Sources/RunnerEngine/Errors.swift
@@ -5,4 +5,5 @@ public enum EngineError: Error {
     case jsValueError
     case sourceNotFound
     case jsException(details: String)
+    case runnerError(details: String)
 }
diff --git a/packages/ios-engine/Sources/RunnerEngine/Runner.swift b/packages/ios-engine/Sources/RunnerEngine/Runner.swift
index 274766a..a0505a2 100644
--- a/packages/ios-engine/Sources/RunnerEngine/Runner.swift
+++ b/packages/ios-engine/Sources/RunnerEngine/Runner.swift
@@ -4,20 +4,60 @@ import JavaScriptCore
 public class Runner {
     var machine: JSVirtualMachine
     var contexts: [String: Context]
+
+    private let runLoop: RunLoop
+    private var thread: Thread?
+
     public init() {
         machine = JSVirtualMachine()
         contexts = [:]
+        runLoop = RunLoop.current
     }
 
     func createContext(name: String) throws -> Context {
-        let ctx = try Context(vm: machine, ctxName: name)
+        let context = try Context(vm: machine, contextName: name, runLoop: runLoop)
+
+        if contexts.keys.contains(name) {
+            throw EngineError.runnerError(details: "context with name \(name) already exists")
+        }
 
-        contexts[name] = ctx
+        contexts[name] = context
 
-        return ctx
+        return context
     }
 
     func destroyContext(name: String) {
         contexts.removeValue(forKey: name)
     }
+
+    func start() {
+        thread = Thread { [weak self] in
+            defer {
+                Thread.exit()
+            }
+
+            guard let self = self else { return }
+            guard let thread = self.thread else { return }
+
+            while !thread.isCancelled {
+                self.runLoop.run(mode: .default, before: .distantFuture)
+            }
+        }
+
+        thread?.qualityOfService = .userInitiated
+        thread?.start()
+    }
+
+    func stop() {
+        guard let thread = self.thread else {
+            return
+        }
+
+        thread.cancel()
+        while !thread.isFinished {
+            Thread.sleep(forTimeInterval: 0.05)
+        }
+
+        self.thread = nil
+    }
 }
diff --git a/packages/ios-engine/Tests/RunnerEngineTests/ContextTests.swift b/packages/ios-engine/Tests/RunnerEngineTests/ContextTests.swift
index 53bff61..d91727a 100644
--- a/packages/ios-engine/Tests/RunnerEngineTests/ContextTests.swift
+++ b/packages/ios-engine/Tests/RunnerEngineTests/ContextTests.swift
@@ -123,9 +123,9 @@ final class ContextTests: XCTestCase {
             expectation3.fulfill()
         }
 
-        context.ctx.setObject(successCallback, forKeyedSubscript: "successCallback" as NSString)
-        context.ctx.setObject(successCallback2, forKeyedSubscript: "altSuccessCallback" as NSString)
-        context.ctx.setObject(successCallbackDetails, forKeyedSubscript: "successCallbackDetails" as NSString)
+        context.jsContext.setObject(successCallback, forKeyedSubscript: "successCallback" as NSString)
+        context.jsContext.setObject(successCallback2, forKeyedSubscript: "altSuccessCallback" as NSString)
+        context.jsContext.setObject(successCallbackDetails, forKeyedSubscript: "successCallbackDetails" as NSString)
 
         _ = try context.execute(code: "addEventListener('myEvent', () => { successCallback(); });")
         try  context.dispatchEvent(event: "myEvent")
@@ -194,8 +194,8 @@ final class ContextTests: XCTestCase {
             XCTFail("callback was called and not canceled")
         }
 
-        context.ctx.setObject(successCallback, forKeyedSubscript: "successCallback" as NSString)
-        context.ctx.setObject(failureCallback, forKeyedSubscript: "failureCallback" as NSString)
+        context.jsContext.setObject(successCallback, forKeyedSubscript: "successCallback" as NSString)
+        context.jsContext.setObject(failureCallback, forKeyedSubscript: "failureCallback" as NSString)
 
         guard let value = try context.execute(code: "setTimeout(() => { successCallback(); }, 2000)") else {
             XCTFail("value is null")
@@ -235,7 +235,7 @@ final class ContextTests: XCTestCase {
             calls += 1
         }
 
-        context.ctx.setObject(timerCallback, forKeyedSubscript: "timerCallback" as NSString)
+        context.jsContext.setObject(timerCallback, forKeyedSubscript: "timerCallback" as NSString)
 
         guard let value = try context.execute(code: "setInterval(() => { timerCallback(); }, 2000)") else {
             XCTFail("value is null")
@@ -342,9 +342,9 @@ final class ContextTests: XCTestCase {
             optionsExpectation.fulfill()
         }
 
-        context.ctx.setObject(successCallback, forKeyedSubscript: "successCallback" as NSString)
-        context.ctx.setObject(optionsSuccessCallback, forKeyedSubscript: "successCallback2" as NSString)
-        context.ctx.setObject(failureCallback, forKeyedSubscript: "failureCallback" as NSString)
+        context.jsContext.setObject(successCallback, forKeyedSubscript: "successCallback" as NSString)
+        context.jsContext.setObject(optionsSuccessCallback, forKeyedSubscript: "successCallback2" as NSString)
+        context.jsContext.setObject(failureCallback, forKeyedSubscript: "failureCallback" as NSString)
 
         let basicFetchExample = """
             fetch('https://jsonplaceholder.typicode.com/todos/1')
diff --git a/packages/ios-engine/Tests/RunnerEngineTests/RunnerTests.swift b/packages/ios-engine/Tests/RunnerEngineTests/RunnerTests.swift
index 37c048a..027d4d4 100644
--- a/packages/ios-engine/Tests/RunnerEngineTests/RunnerTests.swift
+++ b/packages/ios-engine/Tests/RunnerEngineTests/RunnerTests.swift
@@ -3,12 +3,49 @@ import XCTest
 @testable import RunnerEngine
 
 final class RunnerTests: XCTestCase {
-    //    func testExample() throws {
-    //        // This is an example of a functional test case.
-    //        // Use XCTAssert and related functions to verify your tests produce the correct
-    //        // results.
-    //        XCTAssertEqual(ios_engine().text, "Hello, World!")
-    //    }
+    func testRunnerCreateDestroy() {
+        let runner = Runner()
+        runner.start()
+
+        runner.stop()
+    }
+
+    func testContextCreateDestroy() throws {
+        let runner = Runner()
+        runner.start()
+
+        _ = try runner.createContext(name: "io.ionic.android_js_engine")
+
+        runner.stop()
+    }
+
+    func testMultipleContexts() throws {
+        let runner = Runner()
+        runner.start()
+
+        var calls = 0
+        let count = Int.random(in: 20..<40)
+
+        let expectation = XCTestExpectation(description: "Run callback on completed timeout callbacks")
+
+        let timeoutCallback: @convention(block) () -> Void = {
+            calls += 1
+
+            if calls >= count {
+                expectation.fulfill()
+            }
+        }
+
+        for i in 1...count {
+            let context = try runner.createContext(name: "context #\(i)")
+            context.jsContext.setObject(timeoutCallback, forKeyedSubscript: "timeoutCallback" as NSString)
+            _ = try context.execute(code: "setTimeout(() => { timeoutCallback(); }, 2000)")
+        }
+
+        wait(for: [expectation], timeout: 5)
+
+        runner.stop()
+    }
 
 }
 // swiftlint:enable all