diff --git a/.gitignore b/.gitignore
index cd2facc7..6f06d6ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,6 @@ version.js
 .nyc_output
 ios.coverage.json
 tests/ios/Fabric.framework/Fabric
+android/.project
+android/.classpath
+android/.settings/org.eclipse.buildship.core.prefs
diff --git a/android/src/main/java/io/invertase/firebase/Utils.java b/android/src/main/java/io/invertase/firebase/Utils.java
index cf05b9be..efc829e7 100644
--- a/android/src/main/java/io/invertase/firebase/Utils.java
+++ b/android/src/main/java/io/invertase/firebase/Utils.java
@@ -2,7 +2,6 @@ package io.invertase.firebase;
 
 import android.app.ActivityManager;
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -15,15 +14,13 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.WritableArray;
-import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.ReadableArray;
-import com.google.firebase.database.DataSnapshot;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.google.firebase.database.MutableData;
+
+
 
 @SuppressWarnings("WeakerAccess")
 public class Utils {
@@ -78,19 +75,7 @@ public class Utils {
     }
   }
 
-  /**
-   * @param dataSnapshot
-   * @param previousChildName
-   * @return
-   */
-  public static WritableMap snapshotToMap(DataSnapshot dataSnapshot, @Nullable String previousChildName) {
-    WritableMap result = Arguments.createMap();
-    WritableMap snapshot = Utils.snapshotToMap(dataSnapshot);
 
-    result.putMap("snapshot", snapshot);
-    result.putString("previousChildName", previousChildName);
-    return result;
-  }
 
   /**
    *
@@ -132,331 +117,6 @@ public class Utils {
     return writableMap;
   }
 
-  /**
-   * @param dataSnapshot
-   * @return
-   */
-  public static WritableMap snapshotToMap(DataSnapshot dataSnapshot) {
-    WritableMap snapshot = Arguments.createMap();
-
-    snapshot.putString("key", dataSnapshot.getKey());
-    snapshot.putBoolean("exists", dataSnapshot.exists());
-    snapshot.putBoolean("hasChildren", dataSnapshot.hasChildren());
-    snapshot.putDouble("childrenCount", dataSnapshot.getChildrenCount());
-    snapshot.putArray("childKeys", Utils.getChildKeys(dataSnapshot));
-    mapPutValue("priority", dataSnapshot.getPriority(), snapshot);
-
-    if (!dataSnapshot.hasChildren()) {
-      mapPutValue("value", dataSnapshot.getValue(), snapshot);
-    } else {
-      Object value = Utils.castValue(dataSnapshot);
-      if (value instanceof WritableNativeArray) {
-        snapshot.putArray("value", (WritableArray) value);
-      } else {
-        snapshot.putMap("value", (WritableMap) value);
-      }
-    }
-
-    return snapshot;
-  }
-
-  /**
-   * @param snapshot
-   * @param <Any>
-   * @return
-   */
-  public static <Any> Any castValue(DataSnapshot snapshot) {
-    if (snapshot.hasChildren()) {
-      if (isArray(snapshot)) {
-        return (Any) buildArray(snapshot);
-      } else {
-        return (Any) buildMap(snapshot);
-      }
-    } else {
-      if (snapshot.getValue() != null) {
-        String type = snapshot.getValue().getClass().getName();
-        switch (type) {
-          case "java.lang.Boolean":
-          case "java.lang.Long":
-          case "java.lang.Double":
-          case "java.lang.String":
-            return (Any) (snapshot.getValue());
-          default:
-            Log.w(TAG, "Invalid type: " + type);
-            return null;
-        }
-      }
-      return null;
-    }
-  }
-
-  /**
-   * @param mutableData
-   * @param <Any>
-   * @return
-   */
-  public static <Any> Any castValue(MutableData mutableData) {
-    if (mutableData.hasChildren()) {
-      if (isArray(mutableData)) {
-        return (Any) buildArray(mutableData);
-      } else {
-        return (Any) buildMap(mutableData);
-      }
-    } else {
-      if (mutableData.getValue() != null) {
-        String type = mutableData.getValue().getClass().getName();
-        switch (type) {
-          case "java.lang.Boolean":
-          case "java.lang.Long":
-          case "java.lang.Double":
-          case "java.lang.String":
-            return (Any) (mutableData.getValue());
-          default:
-            Log.w(TAG, "Invalid type: " + type);
-            return null;
-        }
-      }
-      return null;
-    }
-  }
-
-  /**
-   * Data should be treated as an array if:
-   * 1) All the keys are integers
-   * 2) More than half the keys between 0 and the maximum key in the object have non-empty values
-   * <p>
-   * Definition from: https://firebase.googleblog.com/2014/04/best-practices-arrays-in-firebase.html
-   *
-   * @param snapshot
-   * @return
-   */
-  private static boolean isArray(DataSnapshot snapshot) {
-    long expectedKey = -1;
-    long maxAllowedKey = (snapshot.getChildrenCount() * 2) - 1;
-    for (DataSnapshot child : snapshot.getChildren()) {
-      try {
-        long key = Long.parseLong(child.getKey());
-        if (key > expectedKey && key <= maxAllowedKey) {
-          expectedKey = key;
-        } else {
-          return false;
-        }
-      } catch (NumberFormatException ex) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Data should be treated as an array if:
-   * 1) All the keys are integers
-   * 2) More than half the keys between 0 and the maximum key in the object have non-empty values
-   * <p>
-   * Definition from: https://firebase.googleblog.com/2014/04/best-practices-arrays-in-firebase.html
-   *
-   * @param mutableData
-   * @return
-   */
-  private static boolean isArray(MutableData mutableData) {
-    long expectedKey = -1;
-    long maxAllowedKey = (mutableData.getChildrenCount() * 2) - 1;
-    for (MutableData child : mutableData.getChildren()) {
-      try {
-        long key = Long.parseLong(child.getKey());
-        if (key > expectedKey && key <= maxAllowedKey) {
-          expectedKey++;
-        } else {
-          return false;
-        }
-      } catch (NumberFormatException ex) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * @param snapshot
-   * @param <Any>
-   * @return
-   */
-  private static <Any> WritableArray buildArray(DataSnapshot snapshot) {
-    long expectedKey = 0;
-    WritableArray array = Arguments.createArray();
-    for (DataSnapshot child : snapshot.getChildren()) {
-      long key = Long.parseLong(child.getKey());
-      if (key > expectedKey) {
-        for (long i = expectedKey; i < key; i++) {
-          array.pushNull();
-        }
-        expectedKey = key;
-      }
-      Any castedChild = castValue(child);
-      switch (castedChild.getClass().getName()) {
-        case "java.lang.Boolean":
-          array.pushBoolean((Boolean) castedChild);
-          break;
-        case "java.lang.Long":
-          Long longVal = (Long) castedChild;
-          array.pushDouble((double) longVal);
-          break;
-        case "java.lang.Double":
-          array.pushDouble((Double) castedChild);
-          break;
-        case "java.lang.String":
-          array.pushString((String) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeMap":
-          array.pushMap((WritableMap) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeArray":
-          array.pushArray((WritableArray) castedChild);
-          break;
-        default:
-          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
-          break;
-      }
-      expectedKey++;
-    }
-    return array;
-  }
-
-  /**
-   * @param mutableData
-   * @param <Any>
-   * @return
-   */
-  private static <Any> WritableArray buildArray(MutableData mutableData) {
-    long expectedKey = 0;
-    WritableArray array = Arguments.createArray();
-    for (MutableData child : mutableData.getChildren()) {
-      long key = Long.parseLong(child.getKey());
-      if (key > expectedKey) {
-        for (long i = expectedKey; i < key; i++) {
-          array.pushNull();
-        }
-        expectedKey = key;
-      }
-      Any castedChild = castValue(child);
-      switch (castedChild.getClass().getName()) {
-        case "java.lang.Boolean":
-          array.pushBoolean((Boolean) castedChild);
-          break;
-        case "java.lang.Long":
-          Long longVal = (Long) castedChild;
-          array.pushDouble((double) longVal);
-          break;
-        case "java.lang.Double":
-          array.pushDouble((Double) castedChild);
-          break;
-        case "java.lang.String":
-          array.pushString((String) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeMap":
-          array.pushMap((WritableMap) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeArray":
-          array.pushArray((WritableArray) castedChild);
-          break;
-        default:
-          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
-          break;
-      }
-      expectedKey++;
-    }
-    return array;
-  }
-
-  /**
-   * @param snapshot
-   * @param <Any>
-   * @return
-   */
-  private static <Any> WritableMap buildMap(DataSnapshot snapshot) {
-    WritableMap map = Arguments.createMap();
-    for (DataSnapshot child : snapshot.getChildren()) {
-      Any castedChild = castValue(child);
-
-      switch (castedChild.getClass().getName()) {
-        case "java.lang.Boolean":
-          map.putBoolean(child.getKey(), (Boolean) castedChild);
-          break;
-        case "java.lang.Long":
-          map.putDouble(child.getKey(), (double) ((Long) castedChild));
-          break;
-        case "java.lang.Double":
-          map.putDouble(child.getKey(), (Double) castedChild);
-          break;
-        case "java.lang.String":
-          map.putString(child.getKey(), (String) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeMap":
-          map.putMap(child.getKey(), (WritableMap) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeArray":
-          map.putArray(child.getKey(), (WritableArray) castedChild);
-          break;
-        default:
-          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
-          break;
-      }
-    }
-    return map;
-  }
-
-  /**
-   * @param mutableData
-   * @param <Any>
-   * @return
-   */
-  private static <Any> WritableMap buildMap(MutableData mutableData) {
-    WritableMap map = Arguments.createMap();
-    for (MutableData child : mutableData.getChildren()) {
-      Any castedChild = castValue(child);
-
-      switch (castedChild.getClass().getName()) {
-        case "java.lang.Boolean":
-          map.putBoolean(child.getKey(), (Boolean) castedChild);
-          break;
-        case "java.lang.Long":
-          map.putDouble(child.getKey(), (double) ((Long) castedChild));
-          break;
-        case "java.lang.Double":
-          map.putDouble(child.getKey(), (Double) castedChild);
-          break;
-        case "java.lang.String":
-          map.putString(child.getKey(), (String) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeMap":
-          map.putMap(child.getKey(), (WritableMap) castedChild);
-          break;
-        case "com.facebook.react.bridge.WritableNativeArray":
-          map.putArray(child.getKey(), (WritableArray) castedChild);
-          break;
-        default:
-          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
-          break;
-      }
-    }
-    return map;
-  }
-
-  /**
-   * @param snapshot
-   * @return
-   */
-  public static WritableArray getChildKeys(DataSnapshot snapshot) {
-    WritableArray childKeys = Arguments.createArray();
-
-    if (snapshot.hasChildren()) {
-      for (DataSnapshot child : snapshot.getChildren()) {
-        childKeys.pushString(child.getKey());
-      }
-    }
-
-    return childKeys;
-  }
 
   public static Map<String, Object> recursivelyDeconstructReadableMap(ReadableMap readableMap) {
     Map<String, Object> deconstructedMap = new HashMap<>();
diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java
index bbf51038..3d99b522 100644
--- a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java
+++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java
@@ -14,7 +14,6 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 
-import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.Query;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
@@ -134,7 +133,7 @@ class RNFirebaseDatabaseReference {
     ValueEventListener onceValueEventListener = new ValueEventListener() {
       @Override
       public void onDataChange(DataSnapshot dataSnapshot) {
-        WritableMap data = Utils.snapshotToMap(dataSnapshot, null);
+        WritableMap data = RNFirebaseDatabaseUtils.snapshotToMap(dataSnapshot, null);
         promise.resolve(data);
       }
 
@@ -160,7 +159,7 @@ class RNFirebaseDatabaseReference {
       public void onChildAdded(DataSnapshot dataSnapshot, String previousChildName) {
         if ("child_added".equals(eventName)) {
           query.removeEventListener(this);
-          WritableMap data = Utils.snapshotToMap(dataSnapshot, previousChildName);
+          WritableMap data = RNFirebaseDatabaseUtils.snapshotToMap(dataSnapshot, previousChildName);
           promise.resolve(data);
         }
       }
@@ -169,7 +168,7 @@ class RNFirebaseDatabaseReference {
       public void onChildChanged(DataSnapshot dataSnapshot, String previousChildName) {
         if ("child_changed".equals(eventName)) {
           query.removeEventListener(this);
-          WritableMap data = Utils.snapshotToMap(dataSnapshot, previousChildName);
+          WritableMap data = RNFirebaseDatabaseUtils.snapshotToMap(dataSnapshot, previousChildName);
           promise.resolve(data);
         }
       }
@@ -178,7 +177,7 @@ class RNFirebaseDatabaseReference {
       public void onChildRemoved(DataSnapshot dataSnapshot) {
         if ("child_removed".equals(eventName)) {
           query.removeEventListener(this);
-          WritableMap data = Utils.snapshotToMap(dataSnapshot, null);
+          WritableMap data = RNFirebaseDatabaseUtils.snapshotToMap(dataSnapshot, null);
           promise.resolve(data);
         }
       }
@@ -187,7 +186,7 @@ class RNFirebaseDatabaseReference {
       public void onChildMoved(DataSnapshot dataSnapshot, String previousChildName) {
         if ("child_moved".equals(eventName)) {
           query.removeEventListener(this);
-          WritableMap data = Utils.snapshotToMap(dataSnapshot, previousChildName);
+          WritableMap data = RNFirebaseDatabaseUtils.snapshotToMap(dataSnapshot, previousChildName);
           promise.resolve(data);
         }
       }
@@ -317,7 +316,7 @@ class RNFirebaseDatabaseReference {
    */
   private void handleDatabaseEvent(String eventType, ReadableMap registration, DataSnapshot dataSnapshot, @Nullable String previousChildName) {
     WritableMap event = Arguments.createMap();
-    WritableMap data = Utils.snapshotToMap(dataSnapshot, previousChildName);
+    WritableMap data = RNFirebaseDatabaseUtils.snapshotToMap(dataSnapshot, previousChildName);
 
     event.putMap("data", data);
     event.putString("key", key);
diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseUtils.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseUtils.java
new file mode 100644
index 00000000..71d64573
--- /dev/null
+++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseUtils.java
@@ -0,0 +1,358 @@
+package io.invertase.firebase.database;
+
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeArray;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.MutableData;
+
+import io.invertase.firebase.Utils;
+
+public class RNFirebaseDatabaseUtils {
+  private static final String TAG = "RNFirebaseDatabaseUtils";
+
+  /**
+   * @param dataSnapshot
+   * @param previousChildName
+   * @return
+   */
+  public static WritableMap snapshotToMap(DataSnapshot dataSnapshot, @Nullable String previousChildName) {
+    WritableMap result = Arguments.createMap();
+    WritableMap snapshot = snapshotToMap(dataSnapshot);
+
+    result.putMap("snapshot", snapshot);
+    result.putString("previousChildName", previousChildName);
+    return result;
+  }
+
+  /**
+   * @param dataSnapshot
+   * @return
+   */
+  public static WritableMap snapshotToMap(DataSnapshot dataSnapshot) {
+    WritableMap snapshot = Arguments.createMap();
+
+    snapshot.putString("key", dataSnapshot.getKey());
+    snapshot.putBoolean("exists", dataSnapshot.exists());
+    snapshot.putBoolean("hasChildren", dataSnapshot.hasChildren());
+    snapshot.putDouble("childrenCount", dataSnapshot.getChildrenCount());
+    snapshot.putArray("childKeys", getChildKeys(dataSnapshot));
+    Utils.mapPutValue("priority", dataSnapshot.getPriority(), snapshot);
+
+    if (!dataSnapshot.hasChildren()) {
+      Utils.mapPutValue("value", dataSnapshot.getValue(), snapshot);
+    } else {
+      Object value = castValue(dataSnapshot);
+      if (value instanceof WritableNativeArray) {
+        snapshot.putArray("value", (WritableArray) value);
+      } else {
+        snapshot.putMap("value", (WritableMap) value);
+      }
+    }
+
+    return snapshot;
+  }
+
+  /**
+   * @param snapshot
+   * @param <Any>
+   * @return
+   */
+  public static <Any> Any castValue(DataSnapshot snapshot) {
+    if (snapshot.hasChildren()) {
+      if (isArray(snapshot)) {
+        return (Any) buildArray(snapshot);
+      } else {
+        return (Any) buildMap(snapshot);
+      }
+    } else {
+      if (snapshot.getValue() != null) {
+        String type = snapshot.getValue().getClass().getName();
+        switch (type) {
+          case "java.lang.Boolean":
+          case "java.lang.Long":
+          case "java.lang.Double":
+          case "java.lang.String":
+            return (Any) (snapshot.getValue());
+          default:
+            Log.w(TAG, "Invalid type: " + type);
+            return null;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * @param mutableData
+   * @param <Any>
+   * @return
+   */
+  public static <Any> Any castValue(MutableData mutableData) {
+    if (mutableData.hasChildren()) {
+      if (isArray(mutableData)) {
+        return (Any) buildArray(mutableData);
+      } else {
+        return (Any) buildMap(mutableData);
+      }
+    } else {
+      if (mutableData.getValue() != null) {
+        String type = mutableData.getValue().getClass().getName();
+        switch (type) {
+          case "java.lang.Boolean":
+          case "java.lang.Long":
+          case "java.lang.Double":
+          case "java.lang.String":
+            return (Any) (mutableData.getValue());
+          default:
+            Log.w(TAG, "Invalid type: " + type);
+            return null;
+        }
+      }
+      return null;
+    }
+  }
+
+  /**
+   * Data should be treated as an array if:
+   * 1) All the keys are integers
+   * 2) More than half the keys between 0 and the maximum key in the object have non-empty values
+   * <p>
+   * Definition from: https://firebase.googleblog.com/2014/04/best-practices-arrays-in-firebase.html
+   *
+   * @param snapshot
+   * @return
+   */
+  private static boolean isArray(DataSnapshot snapshot) {
+    long expectedKey = -1;
+    long maxAllowedKey = (snapshot.getChildrenCount() * 2) - 1;
+    for (DataSnapshot child : snapshot.getChildren()) {
+      try {
+        long key = Long.parseLong(child.getKey());
+        if (key > expectedKey && key <= maxAllowedKey) {
+          expectedKey = key;
+        } else {
+          return false;
+        }
+      } catch (NumberFormatException ex) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Data should be treated as an array if:
+   * 1) All the keys are integers
+   * 2) More than half the keys between 0 and the maximum key in the object have non-empty values
+   * <p>
+   * Definition from: https://firebase.googleblog.com/2014/04/best-practices-arrays-in-firebase.html
+   *
+   * @param mutableData
+   * @return
+   */
+  private static boolean isArray(MutableData mutableData) {
+    long expectedKey = -1;
+    long maxAllowedKey = (mutableData.getChildrenCount() * 2) - 1;
+    for (MutableData child : mutableData.getChildren()) {
+      try {
+        long key = Long.parseLong(child.getKey());
+        if (key > expectedKey && key <= maxAllowedKey) {
+          expectedKey++;
+        } else {
+          return false;
+        }
+      } catch (NumberFormatException ex) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * @param snapshot
+   * @param <Any>
+   * @return
+   */
+  private static <Any> WritableArray buildArray(DataSnapshot snapshot) {
+    long expectedKey = 0;
+    WritableArray array = Arguments.createArray();
+    for (DataSnapshot child : snapshot.getChildren()) {
+      long key = Long.parseLong(child.getKey());
+      if (key > expectedKey) {
+        for (long i = expectedKey; i < key; i++) {
+          array.pushNull();
+        }
+        expectedKey = key;
+      }
+      Any castedChild = castValue(child);
+      switch (castedChild.getClass().getName()) {
+        case "java.lang.Boolean":
+          array.pushBoolean((Boolean) castedChild);
+          break;
+        case "java.lang.Long":
+          Long longVal = (Long) castedChild;
+          array.pushDouble((double) longVal);
+          break;
+        case "java.lang.Double":
+          array.pushDouble((Double) castedChild);
+          break;
+        case "java.lang.String":
+          array.pushString((String) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeMap":
+          array.pushMap((WritableMap) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeArray":
+          array.pushArray((WritableArray) castedChild);
+          break;
+        default:
+          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
+          break;
+      }
+      expectedKey++;
+    }
+    return array;
+  }
+
+  /**
+   * @param mutableData
+   * @param <Any>
+   * @return
+   */
+  private static <Any> WritableArray buildArray(MutableData mutableData) {
+    long expectedKey = 0;
+    WritableArray array = Arguments.createArray();
+    for (MutableData child : mutableData.getChildren()) {
+      long key = Long.parseLong(child.getKey());
+      if (key > expectedKey) {
+        for (long i = expectedKey; i < key; i++) {
+          array.pushNull();
+        }
+        expectedKey = key;
+      }
+      Any castedChild = castValue(child);
+      switch (castedChild.getClass().getName()) {
+        case "java.lang.Boolean":
+          array.pushBoolean((Boolean) castedChild);
+          break;
+        case "java.lang.Long":
+          Long longVal = (Long) castedChild;
+          array.pushDouble((double) longVal);
+          break;
+        case "java.lang.Double":
+          array.pushDouble((Double) castedChild);
+          break;
+        case "java.lang.String":
+          array.pushString((String) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeMap":
+          array.pushMap((WritableMap) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeArray":
+          array.pushArray((WritableArray) castedChild);
+          break;
+        default:
+          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
+          break;
+      }
+      expectedKey++;
+    }
+    return array;
+  }
+
+  /**
+   * @param snapshot
+   * @param <Any>
+   * @return
+   */
+  private static <Any> WritableMap buildMap(DataSnapshot snapshot) {
+    WritableMap map = Arguments.createMap();
+    for (DataSnapshot child : snapshot.getChildren()) {
+      Any castedChild = castValue(child);
+
+      switch (castedChild.getClass().getName()) {
+        case "java.lang.Boolean":
+          map.putBoolean(child.getKey(), (Boolean) castedChild);
+          break;
+        case "java.lang.Long":
+          map.putDouble(child.getKey(), (double) ((Long) castedChild));
+          break;
+        case "java.lang.Double":
+          map.putDouble(child.getKey(), (Double) castedChild);
+          break;
+        case "java.lang.String":
+          map.putString(child.getKey(), (String) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeMap":
+          map.putMap(child.getKey(), (WritableMap) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeArray":
+          map.putArray(child.getKey(), (WritableArray) castedChild);
+          break;
+        default:
+          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
+          break;
+      }
+    }
+    return map;
+  }
+
+  /**
+   * @param mutableData
+   * @param <Any>
+   * @return
+   */
+  private static <Any> WritableMap buildMap(MutableData mutableData) {
+    WritableMap map = Arguments.createMap();
+    for (MutableData child : mutableData.getChildren()) {
+      Any castedChild = castValue(child);
+
+      switch (castedChild.getClass().getName()) {
+        case "java.lang.Boolean":
+          map.putBoolean(child.getKey(), (Boolean) castedChild);
+          break;
+        case "java.lang.Long":
+          map.putDouble(child.getKey(), (double) ((Long) castedChild));
+          break;
+        case "java.lang.Double":
+          map.putDouble(child.getKey(), (Double) castedChild);
+          break;
+        case "java.lang.String":
+          map.putString(child.getKey(), (String) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeMap":
+          map.putMap(child.getKey(), (WritableMap) castedChild);
+          break;
+        case "com.facebook.react.bridge.WritableNativeArray":
+          map.putArray(child.getKey(), (WritableArray) castedChild);
+          break;
+        default:
+          Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
+          break;
+      }
+    }
+    return map;
+  }
+
+  /**
+   * @param snapshot
+   * @return
+   */
+  public static WritableArray getChildKeys(DataSnapshot snapshot) {
+    WritableArray childKeys = Arguments.createArray();
+
+    if (snapshot.hasChildren()) {
+      for (DataSnapshot child : snapshot.getChildren()) {
+        childKeys.pushString(child.getKey());
+      }
+    }
+
+    return childKeys;
+  }
+
+}
diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseTransactionHandler.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseTransactionHandler.java
index 3c3f9c08..1f5dd6ed 100644
--- a/android/src/main/java/io/invertase/firebase/database/RNFirebaseTransactionHandler.java
+++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseTransactionHandler.java
@@ -114,7 +114,7 @@ public class RNFirebaseTransactionHandler {
     if (!updatesData.hasChildren()) {
       Utils.mapPutValue("value", updatesData.getValue(), updatesMap);
     } else {
-      Object value = Utils.castValue(updatesData);
+      Object value = RNFirebaseDatabaseUtils.castValue(updatesData);
 
       if (value instanceof WritableNativeArray) {
         updatesMap.putArray("value", (WritableArray) value);
@@ -149,7 +149,7 @@ public class RNFirebaseTransactionHandler {
       }
     } else {
       resultMap.putString("type", "complete");
-      resultMap.putMap("snapshot", Utils.snapshotToMap(snapshot));
+      resultMap.putMap("snapshot", RNFirebaseDatabaseUtils.snapshotToMap(snapshot));
     }
 
     return resultMap;