diff --git a/src/Circle.js b/src/Circle.js
index 4366d0ae..fbfb0f22 100644
--- a/src/Circle.js
+++ b/src/Circle.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   circleEventPropTypes,
 } from "./creators/CircleCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 export default class Circle extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -24,6 +27,10 @@ export default class Circle extends Component {
     ...circleEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
@@ -50,10 +57,15 @@ export default class Circle extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const circle = CircleCreator._createCircle(this.props);
+    const circle = CircleCreator._createCircle({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ circle });
   }
diff --git a/src/DirectionsRenderer.js b/src/DirectionsRenderer.js
index 6329a6dd..a15f10a1 100644
--- a/src/DirectionsRenderer.js
+++ b/src/DirectionsRenderer.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   directionsRendererEventPropTypes,
 } from "./creators/DirectionsRendererCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 /*
  * Original author: @alexishevia
  * Original PR: https://github.com/tomchentw/react-google-maps/pull/22
@@ -28,6 +31,10 @@ export default class DirectionsRenderer extends Component {
     ...directionsRendererEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DirectionsRenderer
@@ -46,10 +53,15 @@ export default class DirectionsRenderer extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const directionsRenderer = DirectionsRendererCreator._createDirectionsRenderer(this.props);
+    const directionsRenderer = DirectionsRendererCreator._createDirectionsRenderer({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ directionsRenderer });
   }
diff --git a/src/DrawingManager.js b/src/DrawingManager.js
index 04e4d574..99539acd 100644
--- a/src/DrawingManager.js
+++ b/src/DrawingManager.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   drawingManagerEventPropTypes,
 } from "./creators/DrawingManagerCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 /*
  * Original author: @idolize
  * Original PR: https://github.com/tomchentw/react-google-maps/pull/46
@@ -28,6 +31,10 @@ export default class DrawingManager extends Component {
     ...drawingManagerEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DrawingManager
@@ -42,10 +49,15 @@ export default class DrawingManager extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const drawingManager = DrawingManagerCreator._createDrawingManager(this.props);
+    const drawingManager = DrawingManagerCreator._createDrawingManager({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ drawingManager });
   }
diff --git a/src/InfoWindow.js b/src/InfoWindow.js
index cab427cc..50e43aaa 100644
--- a/src/InfoWindow.js
+++ b/src/InfoWindow.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   infoWindowEventPropTypes,
 } from "./creators/InfoWindowCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 export default class InfoWindow extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -24,6 +27,10 @@ export default class InfoWindow extends Component {
     ...infoWindowEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
@@ -42,10 +49,15 @@ export default class InfoWindow extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const infoWindow = InfoWindowCreator._createInfoWindow(this.props);
+    const infoWindow = InfoWindowCreator._createInfoWindow({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ infoWindow });
   }
diff --git a/src/KmlLayer.js b/src/KmlLayer.js
index 0292d6a9..54907795 100644
--- a/src/KmlLayer.js
+++ b/src/KmlLayer.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   kmlLayerEventPropTypes,
 } from "./creators/KmlLayerCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 export default class KmlLayer extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -24,6 +27,10 @@ export default class KmlLayer extends Component {
     ...kmlLayerEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
@@ -46,18 +53,24 @@ export default class KmlLayer extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const kmlLayer = KmlLayerCreator._createKmlLayer(this.props);
+    const kmlLayer = KmlLayerCreator._createKmlLayer({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ kmlLayer });
   }
 
   render() {
+    const { mapHolderRef } = this.context;
     if (this.state.kmlLayer) {
       return (
-        <KmlLayerCreator kmlLayer={this.state.kmlLayer} {...this.props}>
+        <KmlLayerCreator mapHolderRef={mapHolderRef} kmlLayer={this.state.kmlLayer} {...this.props}>
           {this.props.children}
         </KmlLayerCreator>
       );
diff --git a/src/Marker.js b/src/Marker.js
index 0d641003..05569b8e 100644
--- a/src/Marker.js
+++ b/src/Marker.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   markerEventPropTypes,
 } from "./creators/MarkerCreator";
 
+import GoogleMapHolder from "./creators/GoogleMapHolder";
+
 export default class Marker extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -24,6 +27,10 @@ export default class Marker extends Component {
     ...markerEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Marker
@@ -64,10 +71,14 @@ export default class Marker extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
     if (!canUseDOM) {
       return;
     }
-    const marker = MarkerCreator._createMarker(this.props);
+    const marker = MarkerCreator._createMarker({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ marker });
   }
diff --git a/src/OverlayView.js b/src/OverlayView.js
index 26bd7e48..a054e786 100644
--- a/src/OverlayView.js
+++ b/src/OverlayView.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -13,6 +14,8 @@ import {
   overlayViewControlledPropTypes,
 } from "./creators/OverlayViewCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 /*
  * Original author: @petebrowne
  * Original PR: https://github.com/tomchentw/react-google-maps/pull/63
@@ -32,6 +35,10 @@ export default class OverlayView extends Component {
     ...overlayViewControlledPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   static defaultProps = {
     mapPaneName: OverlayView.OVERLAY_LAYER,
   }
@@ -61,9 +68,10 @@ export default class OverlayView extends Component {
   }
 
   render() {
+    const { mapHolderRef } = this.context;
     if (this.state.overlayView) {
       return (
-        <OverlayViewCreator overlayView={this.state.overlayView} {...this.props}>
+        <OverlayViewCreator mapHolderRef={mapHolderRef} overlayView={this.state.overlayView} {...this.props}>
           {this.props.children}
         </OverlayViewCreator>
       );
diff --git a/src/Polygon.js b/src/Polygon.js
index b1abf33d..1154050a 100644
--- a/src/Polygon.js
+++ b/src/Polygon.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   polygonEventPropTypes,
 } from "./creators/PolygonCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 export default class Polygon extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -23,6 +26,9 @@ export default class Polygon extends Component {
     // Event [onEventName]
     ...polygonEventPropTypes,
   }
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
 
   // Public APIs
   //
@@ -46,10 +52,15 @@ export default class Polygon extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const polygon = PolygonCreator._createPolygon(this.props);
+    const polygon = PolygonCreator._createPolygon({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ polygon });
   }
diff --git a/src/Polyline.js b/src/Polyline.js
index 28adc81d..c84e9ec1 100644
--- a/src/Polyline.js
+++ b/src/Polyline.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   polylineEventPropTypes,
 } from "./creators/PolylineCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 export default class Polyline extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -24,6 +27,10 @@ export default class Polyline extends Component {
     ...polylineEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Polyline
@@ -44,10 +51,15 @@ export default class Polyline extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const polyline = PolylineCreator._createPolyline(this.props);
+    const polyline = PolylineCreator._createPolyline({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ polyline });
   }
diff --git a/src/Rectangle.js b/src/Rectangle.js
index e467ed64..2e576630 100644
--- a/src/Rectangle.js
+++ b/src/Rectangle.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   rectangleEventPropTypes,
 } from "./creators/RectangleCreator";
 
+import { default as GoogleMapHolder } from "./creators/GoogleMapHolder";
+
 /*
  * Original author: @alistairjcbrown
  * Original PR: https://github.com/tomchentw/react-google-maps/pull/80
@@ -28,6 +31,10 @@ export default class Rectangle extends Component {
     ...rectangleEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Rectangle
@@ -48,10 +55,15 @@ export default class Rectangle extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
+
     if (!canUseDOM) {
       return;
     }
-    const rectangle = RectangleCreator._createRectangle(this.props);
+    const rectangle = RectangleCreator._createRectangle({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ rectangle });
   }
diff --git a/src/SearchBox.js b/src/SearchBox.js
index 3008c2d6..687322c3 100644
--- a/src/SearchBox.js
+++ b/src/SearchBox.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   searchBoxEventPropTypes,
 } from "./creators/SearchBoxCreator";
 
+import GoogleMapHolder from "./creators/GoogleMapHolder";
+
 /*
  * Original author: @eyebraus
  * Original PR: https://github.com/tomchentw/react-google-maps/pull/110
@@ -28,6 +31,10 @@ export default class SearchBox extends Component {
     ...searchBoxEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#SearchBox
@@ -46,7 +53,7 @@ export default class SearchBox extends Component {
     if (!canUseDOM) {
       return;
     }
-    const { mapHolderRef, classes, style, placeholder, ...searchBoxProps } = this.props;
+    const { classes, style, placeholder, ...searchBoxProps } = this.props;
 
     // Cannot create input via component - Google Maps will mess with React's internal state by detaching/attaching.
     // Allow developers to style the "hidden element" via inputClasses.
@@ -70,7 +77,8 @@ export default class SearchBox extends Component {
   }
 
   render() {
-    const { mapHolderRef, controlPosition } = this.props;
+    const { controlPosition } = this.props;
+    const { mapHolderRef } = this.context;
 
     return this.state.searchBox ? (
       <SearchBoxCreator controlPosition={controlPosition} inputElement={this.state.inputElement} mapHolderRef={mapHolderRef} searchBox={this.state.searchBox} {...this.props}>
diff --git a/src/_Skeleton.js b/src/_Skeleton.js
index 7c0fdbba..9efe3bd1 100644
--- a/src/_Skeleton.js
+++ b/src/_Skeleton.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from "react";
 
 import {
@@ -14,6 +15,8 @@ import {
   skeletonEventPropTypes,
 } from "./creators/SkeletonCreator";
 
+import GoogleMapHolder from "./creators/GoogleMapHolder";
+
 export default class Skeleton extends Component {
   static propTypes = {
     // Uncontrolled default[props] - used only in componentDidMount
@@ -24,6 +27,10 @@ export default class Skeleton extends Component {
     ...skeletonEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference
@@ -38,10 +45,14 @@ export default class Skeleton extends Component {
   }
 
   componentWillMount() {
+    const { mapHolderRef } = this.context;
     if (!canUseDOM) {
       return;
     }
-    const skeleton = SkeletonCreator._createSkeleton(this.props);
+    const skeleton = SkeletonCreator._createSkeleton({
+      ...this.props,
+      mapHolderRef,
+    });
 
     this.setState({ skeleton });
   }
diff --git a/src/addons/MarkerClusterer.js b/src/addons/MarkerClusterer.js
index e7709215..c1431487 100644
--- a/src/addons/MarkerClusterer.js
+++ b/src/addons/MarkerClusterer.js
@@ -1,6 +1,7 @@
 import {
   default as React,
   Component,
+  PropTypes,
 } from 'react';
 
 import {
@@ -14,6 +15,8 @@ import {
   markerClusterEventPropTypes,
 } from './addonsCreators/MarkerClustererCreator';
 
+import { default as GoogleMapHolder } from "../creators/GoogleMapHolder";
+
 export default class MarkerClusterer extends Component {
   static propTypes = {
     ...markerClusterDefaultPropTypes,
@@ -21,6 +24,10 @@ export default class MarkerClusterer extends Component {
     ...markerClusterEventPropTypes,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   // Public APIs
   // http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclustererplus/docs/reference.html#events
   getAverageCenter() { return this.state.markerClusterer.getAverageCenter(); }
@@ -81,7 +88,8 @@ export default class MarkerClusterer extends Component {
       return;
     }
 
-    const { mapHolderRef, ...markerClustererProps } = this.props;
+    const { ...markerClustererProps } = this.props;
+    const { mapHolderRef } = this.context;
     const markerClusterer = MarkerClustererCreator._createMarkerClusterer(mapHolderRef, markerClustererProps);
 
     this.setState({ markerClusterer });
diff --git a/src/addons/addonsCreators/InfoBoxCreator.js b/src/addons/addonsCreators/InfoBoxCreator.js
index fc4ad1ca..16f439e4 100644
--- a/src/addons/addonsCreators/InfoBoxCreator.js
+++ b/src/addons/addonsCreators/InfoBoxCreator.js
@@ -11,8 +11,6 @@ import { default as composeOptions } from "../../utils/composeOptions";
 import { default as setContentForOptionalReactElement } from "../../utils/setContentForOptionalReactElement";
 import { default as componentLifecycleDecorator } from "../../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "../../creators/GoogleMapHolder";
-
 export const infoBoxControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -49,7 +47,6 @@ export const infoBoxEventPropTypes = eventPropTypes;
 export default class InfoBoxCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     infoBox: PropTypes.object.isRequired,
   }
 
diff --git a/src/addons/addonsCreators/MarkerClustererCreator.js b/src/addons/addonsCreators/MarkerClustererCreator.js
index 0ed29bdf..b728f6be 100644
--- a/src/addons/addonsCreators/MarkerClustererCreator.js
+++ b/src/addons/addonsCreators/MarkerClustererCreator.js
@@ -73,11 +73,15 @@ export const markerClustererEventPropTypes = eventPropTypes;
   updaters: markerClustererUpdaters,
 })
 export default class MarkerClustererCreator extends Component {
-  static PropTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
+
+  static propTypes = {
     markerClusterer: PropTypes.object.isRequired,
   }
 
+  static contextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
   static _createMarkerClusterer(mapHolderRef, markerClustererProps) {
     const GoogleMarkerClusterer = require(`marker-clusterer-plus`);
 
@@ -108,7 +112,8 @@ export default class MarkerClustererCreator extends Component {
   }
 
   render() {
-    const { mapHolderRef, children } = this.props;
+    const { children } = this.props;
+    const { mapHolderRef } = this.context;
 
     if (Children.count(children) > 0) {
       return (
diff --git a/src/creators/CircleCreator.js b/src/creators/CircleCreator.js
index a4d65419..b8ea599a 100644
--- a/src/creators/CircleCreator.js
+++ b/src/creators/CircleCreator.js
@@ -10,8 +10,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const circleControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -51,7 +49,6 @@ export const circleEventPropTypes = eventPropTypes;
 export default class CircleCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     circle: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/DirectionsRendererCreator.js b/src/creators/DirectionsRendererCreator.js
index 4c0ecb49..2b5e1aae 100644
--- a/src/creators/DirectionsRendererCreator.js
+++ b/src/creators/DirectionsRendererCreator.js
@@ -11,8 +11,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const directionsRendererControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -48,7 +46,6 @@ export const directionsRendererEventPropTypes = eventPropTypes;
 export default class DirectionsRendererCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     directionsRenderer: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/DrawingManagerCreator.js b/src/creators/DrawingManagerCreator.js
index 82e3473e..b8ef22d8 100644
--- a/src/creators/DrawingManagerCreator.js
+++ b/src/creators/DrawingManagerCreator.js
@@ -10,8 +10,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const drawingManagerControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -43,7 +41,6 @@ export const drawingManagerEventPropTypes = eventPropTypes;
 export default class DrawingManagerCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     drawingManager: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/GoogleMapHolder.js b/src/creators/GoogleMapHolder.js
index 16c4425e..f870794f 100644
--- a/src/creators/GoogleMapHolder.js
+++ b/src/creators/GoogleMapHolder.js
@@ -2,7 +2,6 @@ import {
   default as React,
   PropTypes,
   Component,
-  Children,
 } from "react";
 
 import {
@@ -69,6 +68,14 @@ export default class GoogleMapHolder extends Component {
     return new google.maps.Map(domEl, composeOptions(mapProps, mapControlledPropTypes));
   }
 
+  static childContextTypes = {
+    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder),
+  }
+
+  getChildContext() {
+    return { mapHolderRef: this };
+  }
+
   getMap() {
     return this.props.map;
   }
@@ -76,15 +83,7 @@ export default class GoogleMapHolder extends Component {
   render() {
     return (
       <div>
-        {Children.map(this.props.children, (childElement) => {
-          if (React.isValidElement(childElement)) {
-            return React.cloneElement(childElement, {
-              mapHolderRef: this,
-            });
-          } else {
-            return childElement;
-          }
-        })}
+        {this.props.children}
       </div>
     );
   }
diff --git a/src/creators/InfoWindowCreator.js b/src/creators/InfoWindowCreator.js
index 6fcdebef..d5b58c74 100644
--- a/src/creators/InfoWindowCreator.js
+++ b/src/creators/InfoWindowCreator.js
@@ -11,8 +11,6 @@ import { default as composeOptions } from "../utils/composeOptions";
 import { default as setContentForOptionalReactElement } from "../utils/setContentForOptionalReactElement";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const infoWindowControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -49,7 +47,6 @@ export const infoWindowEventPropTypes = eventPropTypes;
 export default class InfoWindowCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     infoWindow: PropTypes.object.isRequired,
     anchorHolderRef: PropTypes.object,
   }
diff --git a/src/creators/MarkerCreator.js b/src/creators/MarkerCreator.js
index 64bead69..b941073c 100644
--- a/src/creators/MarkerCreator.js
+++ b/src/creators/MarkerCreator.js
@@ -11,8 +11,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const markerControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -70,7 +68,6 @@ export const markerEventPropTypes = eventPropTypes;
 export default class MarkerCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     marker: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/OverlayViewCreator.js b/src/creators/OverlayViewCreator.js
index 290d6bc4..0720f700 100644
--- a/src/creators/OverlayViewCreator.js
+++ b/src/creators/OverlayViewCreator.js
@@ -15,8 +15,6 @@ import { default as invariant } from "invariant";
 import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const overlayViewControlledPropTypes = {
 // CustomProps
   mapPaneName: PropTypes.string,
@@ -38,7 +36,6 @@ export const overlayViewDefaultPropTypes = defaultPropsCreator(overlayViewContro
 export default class OverlayViewCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     mapPaneName: PropTypes.string,
     overlayView: PropTypes.object.isRequired,
   }
diff --git a/src/creators/PolygonCreator.js b/src/creators/PolygonCreator.js
index 22a1c8a3..34b79cdb 100644
--- a/src/creators/PolygonCreator.js
+++ b/src/creators/PolygonCreator.js
@@ -10,8 +10,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const polygonControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -51,7 +49,6 @@ export const polygonEventPropTypes = eventPropTypes;
 export default class PolygonCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     polygon: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/PolylineCreator.js b/src/creators/PolylineCreator.js
index 91793138..2e82a2f6 100644
--- a/src/creators/PolylineCreator.js
+++ b/src/creators/PolylineCreator.js
@@ -10,8 +10,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const polylineControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -49,7 +47,6 @@ export const polylineEventPropTypes = eventPropTypes;
 export default class PolylineCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     polyline: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/RectangleCreator.js b/src/creators/RectangleCreator.js
index 3f3d425e..2dbd6683 100644
--- a/src/creators/RectangleCreator.js
+++ b/src/creators/RectangleCreator.js
@@ -10,8 +10,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const rectangleControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -49,7 +47,6 @@ export const rectangleEventPropTypes = eventPropTypes;
 export default class RectangleCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     rectangle: PropTypes.object.isRequired,
   }
 
diff --git a/src/creators/_SkeletonCreator.js b/src/creators/_SkeletonCreator.js
index 3e4847c8..5f4f9291 100644
--- a/src/creators/_SkeletonCreator.js
+++ b/src/creators/_SkeletonCreator.js
@@ -11,8 +11,6 @@ import { default as defaultPropsCreator } from "../utils/defaultPropsCreator";
 import { default as composeOptions } from "../utils/composeOptions";
 import { default as componentLifecycleDecorator } from "../utils/componentLifecycleDecorator";
 
-import { default as GoogleMapHolder } from "./GoogleMapHolder";
-
 export const skeletonControlledPropTypes = {
 // NOTICE!!!!!!
 //
@@ -42,7 +40,6 @@ export const skeletonEventPropTypes = eventPropTypes;
 export default class SkeletonCreator extends Component {
 
   static propTypes = {
-    mapHolderRef: PropTypes.instanceOf(GoogleMapHolder).isRequired,
     skeleton: PropTypes.object.isRequired,
   }