diff --git a/openfeature-provider/src/main/java/com/mixpanel/openfeature/MixpanelProvider.java b/openfeature-provider/src/main/java/com/mixpanel/openfeature/MixpanelProvider.java
index ecb479b..251eea9 100644
--- a/openfeature-provider/src/main/java/com/mixpanel/openfeature/MixpanelProvider.java
+++ b/openfeature-provider/src/main/java/com/mixpanel/openfeature/MixpanelProvider.java
@@ -7,6 +7,8 @@
 import com.mixpanel.mixpanelapi.featureflags.provider.BaseFlagsProvider;
 import com.mixpanel.mixpanelapi.featureflags.provider.LocalFlagsProvider;
 import dev.openfeature.sdk.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -263,6 +265,9 @@ private static Value objectToValue(Object obj) {
         if (obj == null) {
             return new Value();
         }
+        if (obj == JSONObject.NULL) {
+            return new Value();
+        }
         if (obj instanceof Boolean) {
             return new Value((Boolean) obj);
         }
@@ -310,6 +315,22 @@ private static Value objectToValue(Object obj) {
             }
             return new Value(values);
         }
+        if (obj instanceof JSONObject) {
+            JSONObject json = (JSONObject) obj;
+            Map<String, Value> structure = new HashMap<>();
+            for (String key : json.keySet()) {
+                structure.put(key, objectToValue(json.get(key)));
+            }
+            return new Value(new ImmutableStructure(structure));
+        }
+        if (obj instanceof JSONArray) {
+            JSONArray arr = (JSONArray) obj;
+            ArrayList<Value> values = new ArrayList<>();
+            for (int i = 0; i < arr.length(); i++) {
+                values.add(objectToValue(arr.get(i)));
+            }
+            return new Value(values);
+        }
         return new Value(obj.toString());
     }
 }