diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 00785bb..97406ef 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -24,18 +24,19 @@ add_library(
         ${PACKAGE_NAME}
         SHARED
         ../cpp/JSITypedArray.cpp
-        src/main/cpp/FrameHostObject.cpp
-        src/main/cpp/FrameProcessorPluginHostObject.cpp
-        src/main/cpp/JSIJNIConversion.cpp
         src/main/cpp/VisionCamera.cpp
-        src/main/cpp/VisionCameraProxy.cpp
+        # Frame Processor
+        src/main/cpp/frameprocessor/FrameHostObject.cpp
+        src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
+        src/main/cpp/frameprocessor/JSIJNIConversion.cpp
+        src/main/cpp/frameprocessor/VisionCameraProxy.cpp
+        src/main/cpp/frameprocessor/java-bindings/JFrame.cpp
+        src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.cpp
+        src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
+        src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
+        src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
+        # Skia Frame Processor
         src/main/cpp/skia/SkiaRenderer.cpp
-        src/main/cpp/java-bindings/JFrame.cpp
-        src/main/cpp/java-bindings/JFrameProcessor.cpp
-        src/main/cpp/java-bindings/JFrameProcessorPlugin.cpp
-        src/main/cpp/java-bindings/JHashMap.cpp
-        src/main/cpp/java-bindings/JVisionCameraProxy.cpp
-        src/main/cpp/java-bindings/JVisionCameraScheduler.cpp
 )
 
 # Header Search Paths (includes)
@@ -44,6 +45,9 @@ target_include_directories(
         PRIVATE
         "../cpp"
         "src/main/cpp"
+        "src/main/cpp/frameprocessor"
+        "src/main/cpp/frameprocessor/java-bindings"
+        "src/main/cpp/skia"
         "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/react/turbomodule" # <-- CallInvokerHolder JNI wrapper
diff --git a/android/src/main/cpp/VisionCamera.cpp b/android/src/main/cpp/VisionCamera.cpp
index f58de85..275df90 100644
--- a/android/src/main/cpp/VisionCamera.cpp
+++ b/android/src/main/cpp/VisionCamera.cpp
@@ -1,10 +1,10 @@
 #include <jni.h>
 #include <fbjni/fbjni.h>
-#include "java-bindings/JVisionCameraScheduler.h"
-#include "java-bindings/JFrameProcessor.h"
-#include "java-bindings/JVisionCameraProxy.h"
+#include "JVisionCameraScheduler.h"
+#include "JFrameProcessor.h"
+#include "JVisionCameraProxy.h"
 #include "VisionCameraProxy.h"
-#include "skia/SkiaRenderer.h"
+#include "SkiaRenderer.h"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
diff --git a/android/src/main/cpp/FrameHostObject.cpp b/android/src/main/cpp/frameprocessor/FrameHostObject.cpp
similarity index 100%
rename from android/src/main/cpp/FrameHostObject.cpp
rename to android/src/main/cpp/frameprocessor/FrameHostObject.cpp
diff --git a/android/src/main/cpp/FrameHostObject.h b/android/src/main/cpp/frameprocessor/FrameHostObject.h
similarity index 95%
rename from android/src/main/cpp/FrameHostObject.h
rename to android/src/main/cpp/frameprocessor/FrameHostObject.h
index 7ce7e30..297ee24 100644
--- a/android/src/main/cpp/FrameHostObject.h
+++ b/android/src/main/cpp/frameprocessor/FrameHostObject.h
@@ -10,7 +10,7 @@
 #include <vector>
 #include <string>
 
-#include "java-bindings/JFrame.h"
+#include "JFrame.h"
 
 namespace vision {
 
diff --git a/android/src/main/cpp/FrameProcessorPluginHostObject.cpp b/android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
similarity index 96%
rename from android/src/main/cpp/FrameProcessorPluginHostObject.cpp
rename to android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
index 43312d3..8f2711c 100644
--- a/android/src/main/cpp/FrameProcessorPluginHostObject.cpp
+++ b/android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
@@ -34,7 +34,7 @@ jsi::Value FrameProcessorPluginHostObject::get(jsi::Runtime& runtime, const jsi:
       auto frame = frameHostObject->frame;
 
       // Options are second argument (possibly undefined)
-      local_ref<react::ReadableNativeMap::javaobject> options = nullptr;
+      local_ref<JMap<jstring, jobject>> options = nullptr;
       if (count > 1) {
         options = JSIJNIConversion::convertJSIObjectToJNIMap(runtime, arguments[1].asObject(runtime));
       }
diff --git a/android/src/main/cpp/FrameProcessorPluginHostObject.h b/android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.h
similarity index 93%
rename from android/src/main/cpp/FrameProcessorPluginHostObject.h
rename to android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.h
index a9420af..f4eb49d 100644
--- a/android/src/main/cpp/FrameProcessorPluginHostObject.h
+++ b/android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <jsi/jsi.h>
-#include "java-bindings/JFrameProcessorPlugin.h"
+#include "JFrameProcessorPlugin.h"
 #include <memory>
 #include <fbjni/fbjni.h>
 #include <vector>
diff --git a/android/src/main/cpp/JSIJNIConversion.cpp b/android/src/main/cpp/frameprocessor/JSIJNIConversion.cpp
similarity index 54%
rename from android/src/main/cpp/JSIJNIConversion.cpp
rename to android/src/main/cpp/frameprocessor/JSIJNIConversion.cpp
index 5655a1b..558b1b9 100644
--- a/android/src/main/cpp/JSIJNIConversion.cpp
+++ b/android/src/main/cpp/frameprocessor/JSIJNIConversion.cpp
@@ -13,25 +13,71 @@
 #include <utility>
 #include <memory>
 
-#include <react/jni/NativeMap.h>
-#include <react/jni/ReadableNativeMap.h>
-#include <react/jni/WritableNativeMap.h>
-
-#include <jsi/JSIDynamic.h>
-#include <folly/dynamic.h>
-
 #include "FrameHostObject.h"
-#include "java-bindings/JFrame.h"
-#include "java-bindings/JArrayList.h"
-#include "java-bindings/JHashMap.h"
+#include "JFrame.h"
 
 namespace vision {
 
 using namespace facebook;
 
-jni::local_ref<react::ReadableNativeMap::javaobject> JSIJNIConversion::convertJSIObjectToJNIMap(jsi::Runtime& runtime, const jsi::Object& object) {
-  auto dynamic = jsi::dynamicFromValue(runtime, jsi::Value(runtime, object));
-  return react::ReadableNativeMap::createWithContents(std::move(dynamic));
+jni::local_ref<jni::JMap<jstring, jobject>> JSIJNIConversion::convertJSIObjectToJNIMap(jsi::Runtime& runtime, const jsi::Object& object) {
+  auto propertyNames = object.getPropertyNames(runtime);
+  auto size = propertyNames.size(runtime);
+  auto hashMap = jni::JHashMap<jstring, jobject>::create();
+
+  for (size_t i = 0; i < size; i++) {
+    auto propName = propertyNames.getValueAtIndex(runtime, i).asString(runtime);
+    auto key = jni::make_jstring(propName.utf8(runtime));
+    auto value = object.getProperty(runtime, propName);
+
+    if (value.isNull() || value.isUndefined()) {
+      // null
+
+      hashMap->put(key, nullptr);
+
+    } else if (value.isBool()) {
+      // Boolean
+
+      auto boolean = value.getBool();
+      hashMap->put(key, jni::JBoolean::valueOf(boolean));
+
+    } else if (value.isNumber()) {
+      // Double
+
+      auto number = value.getNumber();
+      hashMap->put(key, jni::JDouble::valueOf(number));
+
+    } else if (value.isString()) {
+      // String
+
+      auto str = value.getString(runtime).utf8(runtime);
+      hashMap->put(key, jni::make_jstring(str));
+
+    } else if (value.isObject()) {
+      // Object
+
+      auto valueAsObject = value.getObject(runtime);
+
+      if (valueAsObject.isArray(runtime)) {
+        // List<Object>
+
+      } else if (valueAsObject.isHostObject(runtime)) {
+        throw std::runtime_error("You can't pass HostObjects here.");
+      } else {
+        // Map<String, Object>
+
+        auto map = convertJSIObjectToJNIMap(runtime, valueAsObject);
+        hashMap->put(key, map);
+
+      }
+
+    } else {
+      auto stringRepresentation = value.toString(runtime).utf8(runtime);
+      throw std::runtime_error("Failed to convert jsi::Value to JNI value - unsupported type!" + stringRepresentation);
+    }
+  }
+
+  return hashMap;
 }
 
 jsi::Value JSIJNIConversion::convertJNIObjectToJSIValue(jsi::Runtime &runtime, const jni::local_ref<jobject>& object) {
@@ -66,10 +112,10 @@ jsi::Value JSIJNIConversion::convertJNIObjectToJSIValue(jsi::Runtime &runtime, c
 
     return jsi::String::createFromUtf8(runtime, object->toString());
 
-  } else if (object->isInstanceOf(JArrayList<jobject>::javaClassStatic())) {
-    // ArrayList<E>
+  } else if (object->isInstanceOf(JList<jobject>::javaClassStatic())) {
+    // List<E>
 
-    auto arrayList = static_ref_cast<JArrayList<jobject>>(object);
+    auto arrayList = static_ref_cast<JList<jobject>>(object);
     auto size = arrayList->size();
 
     auto result = jsi::Array(runtime, size);
@@ -80,19 +126,10 @@ jsi::Value JSIJNIConversion::convertJNIObjectToJSIValue(jsi::Runtime &runtime, c
     }
     return result;
 
-  } else if (object->isInstanceOf(react::ReadableArray::javaClassStatic())) {
-    // ReadableArray
+  } else if (object->isInstanceOf(JMap<jstring, jobject>::javaClassStatic())) {
+    // Map<K, V>
 
-    static const auto toArrayListFunc = react::ReadableArray::javaClassLocal()->getMethod<JArrayList<jobject>()>("toArrayList");
-
-    // call recursive, this time ArrayList<E>
-    auto array = toArrayListFunc(object.get());
-    return convertJNIObjectToJSIValue(runtime, array);
-
-  } else if (object->isInstanceOf(JHashMap<jstring, jobject>::javaClassStatic())) {
-    // HashMap<K, V>
-
-    auto map = static_ref_cast<JHashMap<jstring, jobject>>(object);
+    auto map = static_ref_cast<JMap<jstring, jobject>>(object);
 
     auto result = jsi::Object(runtime);
     for (const auto& entry : *map) {
@@ -103,16 +140,7 @@ jsi::Value JSIJNIConversion::convertJNIObjectToJSIValue(jsi::Runtime &runtime, c
     }
     return result;
 
-  } else if (object->isInstanceOf(react::ReadableMap::javaClassStatic())) {
-    // ReadableMap
-
-    static const auto toHashMapFunc = react::ReadableMap::javaClassLocal()->getMethod<JHashMap<jstring, jobject>()>("toHashMap");
-
-    // call recursive, this time HashMap<K, V>
-    auto hashMap = toHashMapFunc(object.get());
-    return convertJNIObjectToJSIValue(runtime, hashMap);
-
-  } else if (object->isInstanceOf(JFrame::javaClassStatic())) {
+  } if (object->isInstanceOf(JFrame::javaClassStatic())) {
     // Frame
     auto frame = static_ref_cast<JFrame>(object);
 
diff --git a/android/src/main/cpp/JSIJNIConversion.h b/android/src/main/cpp/frameprocessor/JSIJNIConversion.h
similarity index 67%
rename from android/src/main/cpp/JSIJNIConversion.h
rename to android/src/main/cpp/frameprocessor/JSIJNIConversion.h
index 3e55848..56a9e9f 100644
--- a/android/src/main/cpp/JSIJNIConversion.h
+++ b/android/src/main/cpp/frameprocessor/JSIJNIConversion.h
@@ -7,7 +7,6 @@
 #include <jsi/jsi.h>
 #include <jni.h>
 #include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
 
 namespace vision {
 
@@ -15,7 +14,7 @@ namespace JSIJNIConversion {
 
 using namespace facebook;
 
-jni::local_ref<react::ReadableNativeMap::javaobject> convertJSIObjectToJNIMap(jsi::Runtime& runtime, const jsi::Object& object);
+jni::local_ref<jni::JMap<jstring, jobject>> convertJSIObjectToJNIMap(jsi::Runtime& runtime, const jsi::Object& object);
 
 jsi::Value convertJNIObjectToJSIValue(jsi::Runtime& runtime, const jni::local_ref<jobject>& object);
 
diff --git a/android/src/main/cpp/VisionCameraProxy.cpp b/android/src/main/cpp/frameprocessor/VisionCameraProxy.cpp
similarity index 98%
rename from android/src/main/cpp/VisionCameraProxy.cpp
rename to android/src/main/cpp/frameprocessor/VisionCameraProxy.cpp
index b41d1e2..3667235 100644
--- a/android/src/main/cpp/VisionCameraProxy.cpp
+++ b/android/src/main/cpp/frameprocessor/VisionCameraProxy.cpp
@@ -5,8 +5,8 @@
 #include "VisionCameraProxy.h"
 #include <jsi/jsi.h>
 
-#include "java-bindings/JFrameProcessor.h"
-#include "java-bindings/JFrameProcessorPlugin.h"
+#include "JFrameProcessor.h"
+#include "JFrameProcessorPlugin.h"
 #include "JSIJNIConversion.h"
 
 #include <android/log.h>
diff --git a/android/src/main/cpp/VisionCameraProxy.h b/android/src/main/cpp/frameprocessor/VisionCameraProxy.h
similarity index 93%
rename from android/src/main/cpp/VisionCameraProxy.h
rename to android/src/main/cpp/frameprocessor/VisionCameraProxy.h
index 65830b1..38fa457 100644
--- a/android/src/main/cpp/VisionCameraProxy.h
+++ b/android/src/main/cpp/frameprocessor/VisionCameraProxy.h
@@ -6,8 +6,8 @@
 
 #include <jsi/jsi.h>
 
-#include "java-bindings/JVisionCameraScheduler.h"
-#include "java-bindings/JVisionCameraProxy.h"
+#include "JVisionCameraScheduler.h"
+#include "JVisionCameraProxy.h"
 
 #include <vector>
 #include <string>
diff --git a/android/src/main/cpp/java-bindings/JFrame.cpp b/android/src/main/cpp/frameprocessor/java-bindings/JFrame.cpp
similarity index 100%
rename from android/src/main/cpp/java-bindings/JFrame.cpp
rename to android/src/main/cpp/frameprocessor/java-bindings/JFrame.cpp
diff --git a/android/src/main/cpp/java-bindings/JFrame.h b/android/src/main/cpp/frameprocessor/java-bindings/JFrame.h
similarity index 100%
rename from android/src/main/cpp/java-bindings/JFrame.h
rename to android/src/main/cpp/frameprocessor/java-bindings/JFrame.h
diff --git a/android/src/main/cpp/java-bindings/JFrameProcessor.cpp b/android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.cpp
similarity index 100%
rename from android/src/main/cpp/java-bindings/JFrameProcessor.cpp
rename to android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.cpp
diff --git a/android/src/main/cpp/java-bindings/JFrameProcessor.h b/android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.h
similarity index 100%
rename from android/src/main/cpp/java-bindings/JFrameProcessor.h
rename to android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessor.h
diff --git a/android/src/main/cpp/java-bindings/JFrameProcessorPlugin.cpp b/android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
similarity index 84%
rename from android/src/main/cpp/java-bindings/JFrameProcessorPlugin.cpp
rename to android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
index 9fa1d45..c958d09 100644
--- a/android/src/main/cpp/java-bindings/JFrameProcessorPlugin.cpp
+++ b/android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.cpp
@@ -12,10 +12,10 @@ namespace vision {
 using namespace facebook;
 using namespace jni;
 
-using TCallback = jobject(alias_ref<JFrame::javaobject>, alias_ref<react::ReadableNativeMap::javaobject> params);
+using TCallback = jobject(alias_ref<JFrame::javaobject>, alias_ref<JMap<jstring, jobject>> params);
 
 local_ref<jobject> JFrameProcessorPlugin::callback(const alias_ref<JFrame::javaobject>& frame,
-                                                   const alias_ref<react::ReadableNativeMap::javaobject>& params) const {
+                                                   const alias_ref<JMap<jstring, jobject>>& params) const {
   auto callbackMethod = getClass()->getMethod<TCallback>("callback");
 
   auto result = callbackMethod(self(), frame, params);
diff --git a/android/src/main/cpp/java-bindings/JFrameProcessorPlugin.h b/android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.h
similarity index 78%
rename from android/src/main/cpp/java-bindings/JFrameProcessorPlugin.h
rename to android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.h
index f6f7090..b68872e 100644
--- a/android/src/main/cpp/java-bindings/JFrameProcessorPlugin.h
+++ b/android/src/main/cpp/frameprocessor/java-bindings/JFrameProcessorPlugin.h
@@ -7,7 +7,6 @@
 #include <jni.h>
 #include <fbjni/fbjni.h>
 #include <string>
-#include <react/jni/ReadableNativeMap.h>
 
 #include "JFrame.h"
 
@@ -24,7 +23,7 @@ struct JFrameProcessorPlugin : public JavaClass<JFrameProcessorPlugin> {
    * Call the plugin.
    */
   local_ref<jobject> callback(const alias_ref<JFrame::javaobject>& frame,
-                              const alias_ref<react::ReadableNativeMap::javaobject>& params) const;
+                              const alias_ref<JMap<jstring, jobject>>& params) const;
 };
 
 } // namespace vision
diff --git a/android/src/main/cpp/java-bindings/JVisionCameraProxy.cpp b/android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
similarity index 97%
rename from android/src/main/cpp/java-bindings/JVisionCameraProxy.cpp
rename to android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
index cf48a32..c702c25 100644
--- a/android/src/main/cpp/java-bindings/JVisionCameraProxy.cpp
+++ b/android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.cpp
@@ -9,7 +9,6 @@
 #include <string>
 
 #include <jsi/jsi.h>
-#include <react/jni/ReadableNativeMap.h>
 
 #include "FrameProcessorPluginHostObject.h"
 #include "JSITypedArray.h"
@@ -24,7 +23,7 @@ namespace vision {
 using TSelf = local_ref<HybridClass<JVisionCameraProxy>::jhybriddata>;
 using TJSCallInvokerHolder = jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>;
 using TScheduler = jni::alias_ref<JVisionCameraScheduler::javaobject>;
-using TOptions = jni::local_ref<react::ReadableNativeMap::javaobject>;
+using TOptions = jni::local_ref<JMap<jstring, jobject>>;
 
 JVisionCameraProxy::JVisionCameraProxy(const jni::alias_ref<JVisionCameraProxy::jhybridobject>& javaThis,
                                        jsi::Runtime* runtime,
diff --git a/android/src/main/cpp/java-bindings/JVisionCameraProxy.h b/android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.h
similarity index 94%
rename from android/src/main/cpp/java-bindings/JVisionCameraProxy.h
rename to android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.h
index 9840e4f..713df73 100644
--- a/android/src/main/cpp/java-bindings/JVisionCameraProxy.h
+++ b/android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraProxy.h
@@ -6,7 +6,6 @@
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
-#include <react/jni/ReadableNativeMap.h>
 #include <ReactCommon/CallInvokerHolder.h>
 
 #include "JFrameProcessorPlugin.h"
@@ -34,7 +33,7 @@ class JVisionCameraProxy : public jni::HybridClass<JVisionCameraProxy> {
                          const jsi::Object& frameProcessor);
   void removeFrameProcessor(int viewTag);
   jni::local_ref<JFrameProcessorPlugin::javaobject> getFrameProcessorPlugin(const std::string& name,
-                                                                            jni::local_ref<react::ReadableNativeMap::javaobject> options);
+                                                                            jni::local_ref<JMap<jstring, jobject>> options);
 
   jsi::Runtime* getJSRuntime() { return _runtime; }
 
diff --git a/android/src/main/cpp/java-bindings/JVisionCameraScheduler.cpp b/android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
similarity index 100%
rename from android/src/main/cpp/java-bindings/JVisionCameraScheduler.cpp
rename to android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.cpp
diff --git a/android/src/main/cpp/java-bindings/JVisionCameraScheduler.h b/android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.h
similarity index 100%
rename from android/src/main/cpp/java-bindings/JVisionCameraScheduler.h
rename to android/src/main/cpp/frameprocessor/java-bindings/JVisionCameraScheduler.h
diff --git a/android/src/main/cpp/java-bindings/JArrayList.h b/android/src/main/cpp/java-bindings/JArrayList.h
deleted file mode 100644
index 1b96134..0000000
--- a/android/src/main/cpp/java-bindings/JArrayList.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Created by Marc Rousavy on 24.06.21.
-//
-
-#pragma once
-
-#include <jni.h>
-#include <fbjni/fbjni.h>
-
-namespace vision {
-
-using namespace facebook;
-using namespace jni;
-
-// TODO: Remove when fbjni 0.2.3 releases.
-template <typename E = jobject>
-struct JArrayList : JavaClass<JArrayList<E>, JList<E>> {
-  constexpr static auto kJavaDescriptor = "Ljava/util/ArrayList;";
-};
-
-} // namespace vision
diff --git a/android/src/main/cpp/java-bindings/JHashMap.cpp b/android/src/main/cpp/java-bindings/JHashMap.cpp
deleted file mode 100644
index affd464..0000000
--- a/android/src/main/cpp/java-bindings/JHashMap.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Created by Marc Rousavy on 25.06.21.
-//
-
-#include "JHashMap.h"
-
-#include <jni.h>
-#include <fbjni/fbjni.h>
-
-namespace vision {
-
-using namespace facebook;
-using namespace jni;
-
-template <typename K, typename V>
-local_ref<JHashMap<K, V>> JHashMap<K, V>::create() {
-  return JHashMap<K, V>::newInstance();
-}
-
-} // namespace vision
diff --git a/android/src/main/cpp/java-bindings/JHashMap.h b/android/src/main/cpp/java-bindings/JHashMap.h
deleted file mode 100644
index b11d3c8..0000000
--- a/android/src/main/cpp/java-bindings/JHashMap.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Created by Marc Rousavy on 25.06.21.
-//
-
-#pragma once
-
-#include <jni.h>
-#include <fbjni/fbjni.h>
-
-namespace vision {
-
-using namespace facebook;
-using namespace jni;
-
-// TODO: Remove when fbjni 0.2.3 releases.
-template <typename K = jobject, typename V = jobject>
-struct JHashMap : JavaClass<JHashMap<K, V>, JMap<K, V>> {
-  constexpr static auto kJavaDescriptor = "Ljava/util/HashMap;";
-
-  static local_ref<JHashMap<K, V>> create();
-};
-
-} // namespace vision
diff --git a/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPlugin.java b/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPlugin.java
index c9119f8..4793706 100644
--- a/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPlugin.java
+++ b/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPlugin.java
@@ -4,7 +4,7 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReadableNativeMap;
+import java.util.Map;
 
 /**
  * Declares a Frame Processor Plugin.
@@ -21,5 +21,5 @@ public abstract class FrameProcessorPlugin {
      */
     @DoNotStrip
     @Keep
-    public abstract @Nullable Object callback(@NonNull Frame frame, @Nullable ReadableNativeMap params);
+    public abstract @Nullable Object callback(@NonNull Frame frame, @Nullable Map<String, Object> params);
 }
diff --git a/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPluginRegistry.java b/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPluginRegistry.java
index ecbd2a2..3a3c618 100644
--- a/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPluginRegistry.java
+++ b/android/src/main/java/com/mrousavy/camera/frameprocessor/FrameProcessorPluginRegistry.java
@@ -2,12 +2,9 @@ package com.mrousavy.camera.frameprocessor;
 
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
-
 import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReadableNativeMap;
-
-import java.util.HashMap;
 import java.util.Map;
+import java.util.HashMap;
 
 @DoNotStrip
 @Keep
@@ -24,7 +21,7 @@ public class FrameProcessorPluginRegistry {
 
     @DoNotStrip
     @Keep
-    public static FrameProcessorPlugin getPlugin(String name, ReadableNativeMap options) {
+    public static FrameProcessorPlugin getPlugin(String name, Map<String, Object> options) {
         PluginInitializer initializer = Plugins.get(name);
         if (initializer == null) {
             return null;
@@ -33,6 +30,6 @@ public class FrameProcessorPluginRegistry {
     }
 
     public interface PluginInitializer {
-        FrameProcessorPlugin initializePlugin(@Nullable ReadableNativeMap options);
+        FrameProcessorPlugin initializePlugin(@Nullable Map<String, Object> options);
     }
 }
diff --git a/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt b/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
index 30b42e8..5bf11a3 100644
--- a/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
+++ b/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
@@ -6,7 +6,6 @@ import androidx.annotation.UiThread
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.ReadableNativeMap
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
 import com.facebook.react.uimanager.UIManagerHelper
@@ -14,7 +13,6 @@ import com.mrousavy.camera.CameraView
 import com.mrousavy.camera.ViewNotFoundError
 import java.lang.ref.WeakReference
 
-
 @Suppress("KotlinJniMissingFunction") // we use fbjni.
 class VisionCameraProxy(context: ReactApplicationContext) {
   companion object {
@@ -71,7 +69,7 @@ class VisionCameraProxy(context: ReactApplicationContext) {
 
   @DoNotStrip
   @Keep
-  fun getFrameProcessorPlugin(name: String, options: ReadableNativeMap): FrameProcessorPlugin {
+  fun getFrameProcessorPlugin(name: String, options: Map<String, Any>): FrameProcessorPlugin {
     return FrameProcessorPluginRegistry.getPlugin(name, options)
   }
 
diff --git a/docs/docs/guides/FRAME_PROCESSORS_CREATE_OVERVIEW.mdx b/docs/docs/guides/FRAME_PROCESSORS_CREATE_OVERVIEW.mdx
index 13fe39d..b452c2d 100644
--- a/docs/docs/guides/FRAME_PROCESSORS_CREATE_OVERVIEW.mdx
+++ b/docs/docs/guides/FRAME_PROCESSORS_CREATE_OVERVIEW.mdx
@@ -39,8 +39,8 @@ Similar to a TurboModule, the Frame Processor Plugin Registry API automatically
 | `number`             | `NSNumber*` (double)          | `Double`                   |
 | `boolean`            | `NSNumber*` (boolean)         | `Boolean`                  |
 | `string`             | `NSString*`                   | `String`                   |
-| `[]`                 | `NSArray*`                    | `ReadableNativeArray`      |
-| `{}`                 | `NSDictionary*`               | `ReadableNativeMap`        |
+| `[]`                 | `NSArray*`                    | `List<Object>`             |
+| `{}`                 | `NSDictionary*`               | `Map<String, Object>`      |
 | `undefined` / `null` | `nil`                         | `null`                     |
 | `(any, any) => void` | [`RCTResponseSenderBlock`][4] | `(Object, Object) -> void` |
 | [`Frame`][1]         | [`Frame*`][2]                 | [`Frame`][3]               |
diff --git a/docs/docs/guides/FRAME_PROCESSOR_CREATE_PLUGIN_ANDROID.mdx b/docs/docs/guides/FRAME_PROCESSOR_CREATE_PLUGIN_ANDROID.mdx
index 6de0deb..681b5db 100644
--- a/docs/docs/guides/FRAME_PROCESSOR_CREATE_PLUGIN_ANDROID.mdx
+++ b/docs/docs/guides/FRAME_PROCESSOR_CREATE_PLUGIN_ANDROID.mdx
@@ -61,7 +61,7 @@ import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin;
 public class FaceDetectorFrameProcessorPlugin extends FrameProcessorPlugin {
 
   @Override
-  public Object callback(Frame frame, ReadableNativeMap arguments) {
+  public Object callback(Frame frame, Map<String, Object> arguments) {
     // code goes here
     return null;
   }
@@ -126,7 +126,7 @@ import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin
 
 class FaceDetectorFrameProcessorPlugin: FrameProcessorPlugin() {
 
-  override fun callback(frame: Frame, arguments: ReadableNativeMap): Any? {
+  override fun callback(frame: Frame, arguments: Map<String, Object>): Any? {
     // code goes here
     return null
   }
diff --git a/example/android/app/src/main/java/com/mrousavy/camera/example/ExampleFrameProcessorPlugin.java b/example/android/app/src/main/java/com/mrousavy/camera/example/ExampleFrameProcessorPlugin.java
index 376ea16..d877807 100644
--- a/example/android/app/src/main/java/com/mrousavy/camera/example/ExampleFrameProcessorPlugin.java
+++ b/example/android/app/src/main/java/com/mrousavy/camera/example/ExampleFrameProcessorPlugin.java
@@ -3,40 +3,40 @@ package com.mrousavy.camera.example;
 import android.media.Image;
 import android.util.Log;
 
-import com.facebook.react.bridge.ReadableNativeMap;
-import com.facebook.react.bridge.WritableNativeArray;
-import com.facebook.react.bridge.WritableNativeMap;
 import com.mrousavy.camera.frameprocessor.Frame;
 import com.mrousavy.camera.frameprocessor.FrameProcessorPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ExampleFrameProcessorPlugin extends FrameProcessorPlugin {
     @Override
-    public Object callback(@NotNull Frame frame, @Nullable ReadableNativeMap params) {
-        HashMap<String, Object> hashMap = params != null ? params.toHashMap() : new HashMap<>();
+    public Object callback(@NotNull Frame frame, @Nullable Map<String, Object> params) {
+        if (params == null) return null;
         Image image = frame.getImage();
 
-        Log.d("ExamplePlugin", image.getWidth() + " x " + image.getHeight() + " Image with format #" + image.getFormat() + ". Logging " + hashMap.size() + " parameters:");
+        Log.d("ExamplePlugin", image.getWidth() + " x " + image.getHeight() + " Image with format #" + image.getFormat() + ". Logging " + params.size() + " parameters:");
 
-        for (String key : hashMap.keySet()) {
-            Object value = hashMap.get(key);
-            Log.d("ExamplePlugin", "  -> " + (value == null ? "(null)" : value.toString() + " (" + value.getClass().getName() + ")"));
+        for (String key : params.keySet()) {
+            Object value = params.get(key);
+            Log.d("ExamplePlugin", "  -> " + (value == null ? "(null)" : value + " (" + value.getClass().getName() + ")"));
         }
 
-        WritableNativeMap map = new WritableNativeMap();
-        map.putString("example_str", "Test");
-        map.putBoolean("example_bool", true);
-        map.putDouble("example_double", 5.3);
+        Map<String, Object> map = new HashMap<>();
+        map.put("example_str", "Test");
+        map.put("example_bool", true);
+        map.put("example_double", 5.3);
 
-        WritableNativeArray array = new WritableNativeArray();
-        array.pushString("Hello!");
-        array.pushBoolean(true);
-        array.pushDouble(17.38);
+        List<Object> array = new ArrayList<>();
+        array.add("Hello!");
+        array.add(true);
+        array.add(17.38);
 
-        map.putArray("example_array", array);
+        map.put("example_array", array);
         return map;
     }
 
diff --git a/example/android/app/src/main/java/com/mrousavy/camera/example/MainApplication.java b/example/android/app/src/main/java/com/mrousavy/camera/example/MainApplication.java
index ba7e6fb..60248d3 100644
--- a/example/android/app/src/main/java/com/mrousavy/camera/example/MainApplication.java
+++ b/example/android/app/src/main/java/com/mrousavy/camera/example/MainApplication.java
@@ -8,7 +8,6 @@ import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;