diff --git a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
index d4acde8..38931c2 100644
--- a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
+++ b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLManager.java
@@ -259,25 +259,7 @@ public class ReactNativeMapboxGLManager extends SimpleViewManager<MapView> {
 
     @ReactProp(name = PROP_COMPASS_IS_HIDDEN)
     public void setCompassIsHidden(MapView view, Boolean value) {
-        view.setCompassEnabled(value);
-    }
-
-    @ReactProp(name = PROP_LOGO_IS_HIDDEN)
-    public void setLogoIsHidden(MapView view, Boolean value) {
-        if (value) {
-            view.setLogoVisibility(0);
-        } else {
-            view.setLogoVisibility(1);
-        }
-    }
-
-    @ReactProp(name = PROP_ATTRIBUTION_IS_HIDDEN)
-    public void setAttributionIsHidden(MapView view, Boolean value) {
-        if (value) {
-            view.setAttributionVisibility(0);
-        } else {
-            view.setAttributionVisibility(1);
-        }
+        view.setCompassEnabled(!value);
     }
 
     public void setCenterCoordinateZoomLevel(MapView view, @Nullable ReadableMap center) {
diff --git a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLModule.java b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLModule.java
index 7464e73..0983c34 100644
--- a/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLModule.java
+++ b/android/src/main/java/com/mapbox/reactnativemapboxgl/ReactNativeMapboxGLModule.java
@@ -36,12 +36,12 @@ public class ReactNativeMapboxGLModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setDirectionAnimated(double mapRef, int direction) {
+    public void setDirectionAnimated(String mapRef, int direction) {
         aPackage.getManager().setDirection(aPackage.getManager().getMapView(), direction);
     }
 
     @ReactMethod
-    public void setCenterCoordinateAnimated(double mapRef, double latitude, double longitude) {
+    public void setCenterCoordinateAnimated(String mapRef, double latitude, double longitude) {
         WritableMap location = Arguments.createMap();
         location.putDouble("latitude", latitude);
         location.putDouble("longitude", longitude);
@@ -49,7 +49,7 @@ public class ReactNativeMapboxGLModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setCenterCoordinateZoomLevelAnimated(double mapRef, double latitude, double longitude, double zoom) {
+    public void setCenterCoordinateZoomLevelAnimated(String mapRef, double latitude, double longitude, double zoom) {
         WritableMap location = Arguments.createMap();
         location.putDouble("latitude", latitude);
         location.putDouble("longitude", longitude);
@@ -58,27 +58,27 @@ public class ReactNativeMapboxGLModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void addAnnotations(double mapRef, ReadableArray value) {
+    public void addAnnotations(String mapRef, ReadableArray value) {
         aPackage.getManager().setAnnotations(aPackage.getManager().getMapView(), value);
     }
 
     @ReactMethod
-    public void setUserTrackingMode(double mapRef, String mode) {
+    public void setUserTrackingMode(String mapRef, String mode) {
         aPackage.getManager().setMyLocationTrackingMode(aPackage.getManager().getMapView(), mode);
     }
 
     @ReactMethod
-    public void removeAllAnnotations(double mapRef) {
+    public void removeAllAnnotations(String mapRef) {
         aPackage.getManager().removeAllAnnotations(aPackage.getManager().getMapView(), true);
     }
 
     @ReactMethod
-    public void setTilt(double mapRef, double pitch) {
+    public void setTilt(String mapRef, double pitch) {
         aPackage.getManager().setTilt(aPackage.getManager().getMapView(), pitch);
     }
 
     @ReactMethod
-    public void setVisibleCoordinateBoundsAnimated(double mapRef, double latSW, double lngSW,double latNE, double lngNE, float paddingTop, float paddingRight, float paddingBottom, float paddingLeft) {
+    public void setVisibleCoordinateBoundsAnimated(String mapRef, double latSW, double lngSW,double latNE, double lngNE, float paddingTop, float paddingRight, float paddingBottom, float paddingLeft) {
         WritableMap info = Arguments.createMap();
         info.putDouble("latSW", latSW);
         info.putDouble("lngSW", lngSW);
diff --git a/index.android.js b/index.android.js
index b4ba1dd..ba61e9f 100644
--- a/index.android.js
+++ b/index.android.js
@@ -31,8 +31,6 @@ var ReactMapView = requireNativeComponent('RCTMapbox', {
       zoomEnabled: React.PropTypes.bool,
       zoomLevel: React.PropTypes.number,
       tilt: React.PropTypes.number,
-      logoIsHidden: React.PropTypes.bool,
-      attributionButtonIsHidden: React.PropTypes.bool,
       compassIsHidden: React.PropTypes.bool,
       onRegionChange: React.PropTypes.func,
       onUserLocationChange: React.PropTypes.func,
@@ -67,8 +65,6 @@ var ReactMapView = requireNativeComponent('RCTMapbox', {
         zoomEnabled: true,
         zoomLevel: 0,
         tilt: 0,
-        attributionButtonIsHidden: false,
-        logoIsHidden: false,
         compassIsHidden: false
       };
     }
@@ -76,7 +72,7 @@ var ReactMapView = requireNativeComponent('RCTMapbox', {
 
 var ReactMapViewWrapper = React.createClass({
   statics: {
-    Mixin: NativeModules.Mapbox
+    Mixin: NativeModules.MapboxGLManager
   },
   handleOnChange(event) {
     if (this.props.onRegionChange) this.props.onRegionChange(event.nativeEvent.src);