diff --git a/google-map/google-map.html b/google-map/google-map.html
index 61aec02..ddd7820 100644
--- a/google-map/google-map.html
+++ b/google-map/google-map.html
@@ -4,58 +4,110 @@
 license that can be found in the LICENSE file.
 -->
 <polymer-element name="google-map" attributes="latitude longitude zoom showCenterMarker">
+  <template>
+    <style>
+      @host {
+        * {
+          position: relative;
+        }
+      }
+      
+      #map {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+      }
+    </style>
+
+    <div id="map"></div>
+  </template>
   <script>
-    Polymer('google-map', {
-      latitude: '-34.397',
-      longitude: '150.644',
-      zoom: 10,
-      showCenterMarker: false,
-      created: function() {
-        var options = {
-          zoom: this.zoom,
-          center: new google.maps.LatLng(this.latitude, this.longitude)
-        };
-        this.map = new google.maps.Map(this, options);
-      },
-      enteredDocument: function() {
-        this.resize();
-      },
-      resize: function() {
-        google.maps.event.trigger(this.map, 'resize');
-        this.updateCenter();
-      },
-      latitudeChanged: function() {
-        this.asyncUpdateCenter();
-      },
-      longitudeChanged: function() {
-        this.asyncUpdateCenter();
-      },
-      zoomChanged: function() {
-        this.map.setZoom(this.zoom);
-      },
-      showCenterMarkerChanged: function() {
-        if (this.centerMarker) {
-          this.centerMarker.setMap(this.showCenterMarker ? this.map : null);
+    (function() {
+      var CALLBACK_NAME = 'polymer_google_map_callback';
+      var MAP_URL = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=' + CALLBACK_NAME;
+      var pendingCallbacks = [];
+      var loading;
+      
+      function loadMapApi(cb) {
+        if (window.google && window.google.maps) {
+          cb();
+          return;
         }
-      },
-      asyncUpdateCenter: function() {
-        this.updateCenterJob = this.job(
-            this.updateCenterJob, this.updateCenter, 0);
-      },
-      updateCenter: function() {
-        this.map.setCenter(
-            new google.maps.LatLng(this.latitude, this.longitude));
-        this.updateCenterMarker();
-      },
-      updateCenterMarker: function() {
-        if (!this.centerMarker) {
-          this.centerMarker = new google.maps.Marker({
-            map: this.map
-          });
+        if (!loading) {
+          loading = true;
+          window[CALLBACK_NAME] = mapApiLoaded.bind(this);
+          var s = document.createElement('script');
+          s.src = MAP_URL;
+          document.head.appendChild(s);
         }
-        this.centerMarker.setPosition(this.map.getCenter());
-        this.showCenterMarkerChanged();
+        pendingCallbacks.push(cb);
       }
-    });
+      
+      function mapApiLoaded() {
+        pendingCallbacks.forEach(function(cb) {
+          cb();
+        });
+      }
+      
+      Polymer('google-map', {
+        latitude: '-34.397',
+        longitude: '150.644',
+        zoom: 10,
+        showCenterMarker: false,
+        observe: {
+          latitude: 'updateCenter',
+          longitude: 'updateCenter'
+        },
+        ready: function() {
+          loadMapApi(this.mapReady.bind(this));
+        },
+        enteredView: function() {
+          this.resize();
+        },
+        mapReady: function() {
+          this.map = new google.maps.Map(this.$.map, {
+            zoom: this.zoom,
+            center: new google.maps.LatLng(this.latitude, this.longitude)
+          });
+          this.showCenterMarkerChanged();
+          this.fire('google-map-ready');
+        },
+        resize: function() {
+          if (this.map) {
+            google.maps.event.trigger(this.map, 'resize');
+            this.updateCenter();
+          }
+        },
+        updateCenter: function() {
+          if (!this.map) {
+            return;
+          }
+          this.map.setCenter(
+              new google.maps.LatLng(this.latitude, this.longitude));
+          this.showCenterMarkerChanged();
+        },
+        zoomChanged: function() {
+          if (this.map) {
+            this.map.setZoom(Number(this.zoom));
+          }
+        },
+        showCenterMarkerChanged: function() {
+          if (!this.map) {
+            return;
+          }
+          if (!this.centerMarker && this.showCenterMarker) {
+            this.centerMarker = new google.maps.Marker({
+              map: this.map
+            });
+          }
+          if (this.centerMarker) {
+            this.centerMarker.setPosition(this.map.getCenter());
+            this.centerMarker.setMap(this.showCenterMarker ? this.map : null);
+          }
+        }
+      });
+    })();
   </script>
 </polymer-element>
\ No newline at end of file
diff --git a/google-map/index.html b/google-map/index.html
index 10210d6..340490d 100644
--- a/google-map/index.html
+++ b/google-map/index.html
@@ -8,7 +8,6 @@
   <head>
     <title>Google Map</title>
     <script src="../../polymer/polymer.js"></script>
-    <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false"></script>
     <link rel="import" href="google-map.html">
     <style>
       google-map {
diff --git a/google-map/metadata.html b/google-map/metadata.html
new file mode 100644
index 0000000..5dcb99f
--- /dev/null
+++ b/google-map/metadata.html
@@ -0,0 +1,8 @@
+<x-meta id="google-map" label="Google Map">
+  <template>
+    <google-map style="width: 400px; height: 400px;"></google-map>
+  </template>
+  <template id="imports">
+    <link rel="import" href="google-map.html">
+  </template>
+</x-meta>
\ No newline at end of file
diff --git a/metadata.html b/metadata.html
index 856eee5..77bd04c 100644
--- a/metadata.html
+++ b/metadata.html
@@ -1,4 +1,5 @@
 <link rel="import" href="smoothie-chart/metadata.html">
+<link rel="import" href="google-map/metadata.html">
 
 <!--
 <x-meta id="ace-element" label="Ace Editor"></x-meta>