diff --git a/CHANGELOG b/CHANGELOG
index f748c00..2716f35 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,3 +10,4 @@
 1.3.0
 - New GIS Cloud layer (gvector.GISCloud)
 - DRYing up the code. Moved _processFeatures from individual layers into Layer.js
+- Creating two super-layers from which all other layers extend from: GeoJSONLayer and EsriJSONLayer
diff --git a/build/Makefile b/build/Makefile
index ec45bac..a13a66a 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -4,6 +4,8 @@
     --js ../src/core/Util.js \
     --js ../src/core/Class.js \
     --js ../src/layer/Layer.js \
+    --js ../src/layer/GeoJSONLayer.js \
+    --js ../src/layer/EsriJSONLayer.js \
     --js ../src/layer/AGS.js \
     --js ../src/layer/A2E.js \
     --js ../src/layer/GeoIQ.js \
diff --git a/build/build.bat b/build/build.bat
index f36599b..7a2346b 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -4,10 +4,12 @@ java -jar ../lib/closure-compiler/compiler.jar ^
 --js ../src/core/Util.js ^
 --js ../src/core/Class.js ^
 --js ../src/layer/Layer.js ^
---js ../src/layer/AGS.js ^
+--js ../src/layer/GeoJSONLayer.js ^
+--js ../src/layer/EsriJSONLayer.js ^
+--js ../src/layer/AGS.js ^
 --js ../src/layer/A2E.js ^
---js ../src/layer/GeoIQ.js ^
---js ../src/layer/CartoDB.js ^
---js ../src/layer/PRWSF.js ^
+--js ../src/layer/GeoIQ.js ^
+--js ../src/layer/CartoDB.js ^
+--js ../src/layer/PRWSF.js ^
 --js ../src/layer/GISCloud.js ^
 --js_output_file ../dist/gvector.js
\ No newline at end of file
diff --git a/build/build.html b/build/build.html
index 26d41f8..773dc09 100644
--- a/build/build.html
+++ b/build/build.html
@@ -173,7 +173,7 @@ <h1>Google Vector Layers Build Helper</h1>
 			label.appendChild(check);
 			check.onchange = onCheckboxChange;
 			
-			if (name == 'Core') {
+			if (name == 'Core' || name == 'Layer') {
 				check.checked = true;
 				check.disabled = true;
 			}
diff --git a/build/deps.js b/build/deps.js
index 8a3d448..6623472 100644
--- a/build/deps.js
+++ b/build/deps.js
@@ -11,46 +11,60 @@ var deps = {
         desc: 'The base class for all layers',
         heading: 'Layers Core'
     },
+
+    GeoJSONLayer: {
+        src: ['layer/GeoJSONLayer.js'],
+        desc: 'The GeoJSON geometry parsing layer type',
+        heading: 'Layers that extend this can parse GeoJSON geometry',
+        deps: ['Layer']
+    },
+
+    EsriJSONLayer: {
+        src: ['layer/EsriJSONLayer.js'],
+        desc: 'The EsriJSON geometry parsing layer type',
+        heading: 'Layers that extend this can parse EsriJSON geometry',
+        deps: ['Layer']
+    },
     
     AGS: {
         src: ['layer/AGS.js'],
         desc: 'The ArcGIS Server layer.',
         heading: 'ArcGIS Server',
-        deps: ['Layer']
+        deps: ['EsriJSONLayer']
     },
     
     A2E: {
         src: ['layer/A2E.js'],
         desc: 'The Arc2Earth layer.',
         heading: 'Arc2Earth',
-        deps: ['Layer', 'AGS']
+        deps: ['AGS']
     },
     
     GeoIQ: {
         src: ['layer/GeoIQ.js'],
         desc: 'The GeoIQ layer.',
         heading: 'GeoIQ',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     },
     
     CartoDB: {
         src: ['layer/CartoDB.js'],
         desc: 'The CartoDB layer.',
         heading: 'CartoDB',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     },
     
     PRWSF: {
         src: ['layer/PRWSF.js'],
         desc: 'The PostGIS RESTful Web Service Framework layer.',
         heading: 'PostGIS RESTful Web Service Framework',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     },
     
     GISCloud: {
         src: ['layer/GISCloud.js'],
         desc: 'The GIS Cloud Layer',
         heading: 'GIS Cloud',
-        deps: ['Layer']
+        deps: ['GeoJSONLayer']
     }
 };
\ No newline at end of file
diff --git a/debug/gvector-include.js b/debug/gvector-include.js
index 22300e0..88cd91d 100644
--- a/debug/gvector-include.js
+++ b/debug/gvector-include.js
@@ -10,6 +10,8 @@
         'core/Class.js',
         
         'layer/Layer.js',
+        'layer/GeoJSONLayer.js',
+        'layer/EsriJSONLayer.js',
         
         'layer/AGS.js',
         'layer/A2E.js',
diff --git a/demos/arc2earth/index.html b/demos/arc2earth/index.html
index fc73105..eccf3ad 100644
--- a/demos/arc2earth/index.html
+++ b/demos/arc2earth/index.html
@@ -142,7 +142,7 @@ <h2>Arc2Earth Sync</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2;
             var a2e_light_rail_lines, a2e_light_rail_stations, a2e_vgi;
diff --git a/demos/arcgis-server/index.html b/demos/arcgis-server/index.html
index 8eadf5e..0e4927f 100644
--- a/demos/arcgis-server/index.html
+++ b/demos/arcgis-server/index.html
@@ -351,7 +351,7 @@ <h2>Winter Weather</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2, map3, map4, map5;
             var ags_light_rail, ags_districts, ags_census, ags_intersections, ags_winter, ags_311;
diff --git a/demos/cartodb/index.html b/demos/cartodb/index.html
index cba87d4..538f61b 100644
--- a/demos/cartodb/index.html
+++ b/demos/cartodb/index.html
@@ -177,7 +177,7 @@ <h2>Flood Zones</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2;
             var cartodb_sewer_line, cartodb_man_hole, cartodb_flood_zones;
diff --git a/demos/geoiq/index.html b/demos/geoiq/index.html
index 3fc695f..9befc3c 100644
--- a/demos/geoiq/index.html
+++ b/demos/geoiq/index.html
@@ -231,7 +231,7 @@ <h2>Mecklenburg County Parks</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2, map3;
             var geoiq_ski_areas, geoiq_foss4g_reg, geoiq_parks;
diff --git a/demos/gis-cloud/index.html b/demos/gis-cloud/index.html
index 60651b7..34f7a0a 100644
--- a/demos/gis-cloud/index.html
+++ b/demos/gis-cloud/index.html
@@ -127,7 +127,7 @@ <h2>Blah</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1;
             var giscloud;
diff --git a/demos/postgis-restful-web-service-framework/index.html b/demos/postgis-restful-web-service-framework/index.html
index a15cc95..91ebca2 100644
--- a/demos/postgis-restful-web-service-framework/index.html
+++ b/demos/postgis-restful-web-service-framework/index.html
@@ -214,7 +214,7 @@ <h2>Bus Stops</h2>
         <script src="../../docs-demo/js/jquery-1.5.2.min.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/docs-demos.js" type="text/javascript"></script>
         <script src="../../docs-demo/js/bootstrap-dropdown.js" type="text/javascript"></script>
-        <script src="../../debug/gvector-include.js" type="text/javascript"></script>
+        <script src="../../dist/gvector.js" type="text/javascript"></script>
         <script type="text/javascript">
             var map1, map2, map3, map4;
             var prwsf_preservation, prwsf_hydrants, prwsf_libraries, prwsf_bus;
diff --git a/dist/gvector.js b/dist/gvector.js
index 4cc7f10..481e0d3 100644
--- a/dist/gvector.js
+++ b/dist/gvector.js
@@ -22,19 +22,19 @@ d;if(a.attributes)d=a.attributes;else if(a.properties)d=a.properties;else if(a.d
 b&&this.infoWindow.setContent(a.iwContent)},_showInfoWindow:function(a,b){var d={content:a.iwContent},e;if(this.options.singleInfoWindow){if(this.infoWindow)this.infoWindow.close(),this.infoWindow=null;this.infoWindow=new google.maps.InfoWindow(d);this.infoWindow.set("associatedFeature",a);e=this}else a.infoWindow=new google.maps.InfoWindow(d),e=a;var c=!1;if(a.vector){if(a.vector.getPaths||a.vector.getPath)c=!0}else if(a.vectors&&a.vectors.length&&(a.vectors[0].getPaths||a.vectors[0].getPath))c=
 !0;var f=this;setTimeout(function(){e.infoWindow.open(f.options.map,c?new google.maps.Marker({position:b.latLng}):a.vector)},200)},_buildBoundsString:function(a){a=a.toUrlValue().split(",");return a[1]+","+a[0]+","+a[3]+","+a[2]},_getFeatureVectorOptions:function(a){var b={},a=a.attributes||a.properties;if(this.options.symbology)switch(this.options.symbology.type){case "single":for(var d in this.options.symbology.vectorOptions)b[d]=this.options.symbology.vectorOptions[d];break;case "unique":for(var e=
 this.options.symbology.property,c=0,f=this.options.symbology.values.length;c<f;c++)if(a[e]==this.options.symbology.values[c].value)for(d in this.options.symbology.values[c].vectorOptions)b[d]=this.options.symbology.values[c].vectorOptions[d];break;case "range":e=this.options.symbology.property;c=0;for(f=this.options.symbology.ranges.length;c<f;c++)if(a[e]>=this.options.symbology.ranges[c].range[0]&&a[e]<=this.options.symbology.ranges[c].range[1])for(d in this.options.symbology.ranges[c].vectorOptions)b[d]=
-this.options.symbology.ranges[c].vectorOptions[d]}return b},_getPropertiesChanged:function(a,b){var d=!1,e;for(e in a)a[e]!=b[e]&&(d=!0);return d},_getGeometryChanged:function(a,b){var d=!1;a.coordinates&&a.coordinates instanceof Array?a.coordinates[0]==b.coordinates[0]&&a.coordinates[1]==b.coordinates[1]||(d=!0):a.x==b.x&&a.y==b.y||(d=!0);return d},_esriJsonGeometryToGoogle:function(a,b){var d,e;if(a.x&&a.y)b.position=new google.maps.LatLng(a.y,a.x),d=new google.maps.Marker(b);else if(a.points){e=
-[];for(var c=0,f=a.points.length;c<f;c++)b.position=new google.maps.LatLng(a.points[c].y,a.points[c].x),e.push(new google.maps.Marker(b))}else if(a.paths)if(a.paths.length>1){e=[];c=0;for(f=a.paths.length;c<f;c++){for(var g=[],h=0,i=a.paths[c].length;h<i;h++)g.push(new google.maps.LatLng(a.paths[c][h][1],a.paths[c][h][0]));b.path=g;e.push(new google.maps.Polyline(b))}}else{g=[];c=0;for(f=a.paths[0].length;c<f;c++)g.push(new google.maps.LatLng(a.paths[0][c][1],a.paths[0][c][0]));b.path=g;d=new google.maps.Polyline(b)}else if(a.rings)if(a.rings.length>
-1){e=[];c=0;for(f=a.rings.length;c<f;c++){for(var j=[],g=[],h=0,i=a.rings[c].length;h<i;h++)g.push(new google.maps.LatLng(a.rings[c][h][1],a.rings[c][h][0]));j.push(g);b.paths=j;e.push(new google.maps.Polygon(b))}}else{j=[];g=[];c=0;for(f=a.rings[0].length;c<f;c++)g.push(new google.maps.LatLng(a.rings[0][c][1],a.rings[0][c][0]));j.push(g);b.paths=j;d=new google.maps.Polygon(b)}return d||e},_geoJsonGeometryToGoogle:function(a,b){var d,e;switch(a.type){case "Point":b.position=new google.maps.LatLng(a.coordinates[1],
-a.coordinates[0]);d=new google.maps.Marker(b);break;case "MultiPoint":e=[];for(var c=0,f=a.coordinates.length;c<f;c++)b.position=new google.maps.LatLng(a.coordinates[c][1],a.coordinates[c][0]),e.push(new google.maps.Marker(b));break;case "LineString":for(var g=[],c=0,f=a.coordinates.length;c<f;c++){var h=new google.maps.LatLng(a.coordinates[c][1],a.coordinates[c][0]);g.push(h)}b.path=g;d=new google.maps.Polyline(b);break;case "MultiLineString":e=[];c=0;for(f=a.coordinates.length;c<f;c++){for(var g=
-[],i=0,j=a.coordinates[c].length;i<j;i++){var k=a.coordinates[c][i],h=new google.maps.LatLng(k[1],k[0]);g.push(h)}b.path=g;e.push(new google.maps.Polyline(b))}break;case "Polygon":k=[];c=0;for(f=a.coordinates.length;c<f;c++){g=[];i=0;for(j=a.coordinates[c].length;i<j;i++)h=new google.maps.LatLng(a.coordinates[c][i][1],a.coordinates[c][i][0]),g.push(h);k.push(g)}b.paths=k;d=new google.maps.Polygon(b);break;case "MultiPolygon":e=[];c=0;for(f=a.coordinates.length;c<f;c++){k=[];i=0;for(j=a.coordinates[c].length;i<
-j;i++){for(var g=[],h=0,l=a.coordinates[c][i].length;h<l;h++)g.push(new google.maps.LatLng(a.coordinates[c][i][h][1],a.coordinates[c][i][h][0]));k.push(g)}b.paths=k;e.push(new google.maps.Polygon(b))}break;case "GeometryCollection":e=[];c=0;for(f=a.geometries.length;c<f;c++)e.push(this._geoJsonGeometryToGoogle(a.geometries[c],b))}return d||e},_makeJsonpRequest:function(a){var b=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript";d.src=a;b.appendChild(d)},
+this.options.symbology.ranges[c].vectorOptions[d]}return b},_getPropertiesChanged:function(a,b){var d=!1,e;for(e in a)a[e]!=b[e]&&(d=!0);return d},_getGeometryChanged:function(a,b){var d=!1;a.coordinates&&a.coordinates instanceof Array?a.coordinates[0]==b.coordinates[0]&&a.coordinates[1]==b.coordinates[1]||(d=!0):a.x==b.x&&a.y==b.y||(d=!0);return d},_makeJsonpRequest:function(a){var b=document.getElementsByTagName("head")[0],d=document.createElement("script");d.type="text/javascript";d.src=a;b.appendChild(d)},
 _processFeatures:function(a){if(this.options.map){var b=this.options.map.getBounds();if(!this._lastQueriedBounds||!this._lastQueriedBounds.equals(b)||this.options.autoUpdate){this._lastQueriedBounds=b;this instanceof gvector.GeoIQ&&(a=JSON.parse(a));if(this instanceof gvector.PRWSF){a.features=a.rows;delete a.rows;for(var b=0,d=a.features.length;b<d;b++){a.features[b].type="Feature";a.features[b].properties={};for(var e in a.features[b].row)e=="geojson"?a.features[b].geometry=a.features[b].row.geojson:
-a.features[b].properties[e]=a.features[b].row[e];delete a.features[b].row}}if(this instanceof gvector.GISCloud){a.features=a.data;delete a.data;b=0;for(d=a.features.length;b<d;b++)a.features[b].type="Feature",a.features[b].properties=a.features[b].data,a.features[b].properties.id=a.features[b].__id,delete a.features[b].data,a.features[b].geometry=a.features[b].__geometry,delete a.features[b].__geometry}if(a&&a.features&&a.features.length)for(b=0;b<a.features.length;b++){if(this instanceof gvector.AGS||
-this instanceof gvector.A2E)a.features[b].properties=a.features[b].attributes,delete a.features[b].attributes;e=!1;if(this.options.uniqueField)for(var c=0;c<this._vectors.length;c++)if(a.features[b].properties[this.options.uniqueField]==this._vectors[c].properties[this.options.uniqueField]&&(e=!0,this.options.dynamic)){if(this._getGeometryChanged(this._vectors[c].geometry,a.features[b].geometry)&&!isNaN(a.features[b].geometry.x||a.features[b].geometry.coordinates[0])&&!isNaN(a.features[b].geometry.y||
-a.features[b].geometry.coordinates[1]))this._vectors[c].geometry=a.features[b].geometry,this._vectors[c].vector.setPosition(new google.maps.LatLng(a.features[b].geometry.y||this._vectors[c].geometry.coordinates[1],a.features[b].geometry.x||this._vectors[c].geometry.coordinates[0]));if(this._getPropertiesChanged(this._vectors[c].properties,a.features[b].properties)&&(this._vectors[c].properties=a.features[b].properties,this.options.infoWindowTemplate&&this._setInfoWindowContent(this._vectors[c]),this.options.symbology&&
-this.options.symbology.type!="single"))if(this._vectors[c].vector)this._vectors[c].vector.setOptions(this._getFeatureVectorOptions(this._vectors[c]));else if(this._vectors[c].vectors)for(var f=0,d=this._vectors[c].vectors.length;f<d;f++)this._vectors[c].vectors[f].setOptions(this._getFeatureVectorOptions(this._vectors[c]))}if(!e||!this.options.uniqueField){if(this instanceof gvector.CartoDB||this instanceof gvector.GeoIQ||this instanceof gvector.PRWSF||this instanceof gvector.GISCloud)d=this._geoJsonGeometryToGoogle(a.features[b].geometry,
-this._getFeatureVectorOptions(a.features[b])),a.features[b][d instanceof Array?"vectors":"vector"]=d;else if(this instanceof gvector.AGS||this instanceof gvector.A2E)d=this._esriJsonGeometryToGoogle(a.features[b].geometry,this._getFeatureVectorOptions(a.features[b])),a.features[b][d instanceof Array?"vectors":"vector"]=d;if(a.features[b].vector)a.features[b].vector.setMap(this.options.map);else if(a.features[b].vectors&&a.features[b].vectors.length)for(f=0;f<a.features[b].vectors.length;f++)a.features[b].vectors[f].setMap(this.options.map);
-this._vectors.push(a.features[b]);if(this.options.infoWindowTemplate){var g=this,d=a.features[b];this._setInfoWindowContent(d);(function(a){if(a.vector)google.maps.event.addListener(a.vector,"click",function(b){g._showInfoWindow(a,b)});else if(a.vectors)for(var b=0,c=a.vectors.length;b<c;b++)google.maps.event.addListener(a.vectors[b],"click",function(b){g._showInfoWindow(a,b)})})(d)}}}}}}});gvector.AGS=gvector.Layer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');this._globalPointer="AGS_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;a.url.substr(a.url.length-1,1)!=="/"&&(a.url+="/");this._originalOptions=gvector.Util.extend({},a);if(a.esriOptions)if(typeof a.esriOptions=="object")gvector.Util.extend(a,this._convertEsriOptions(a.esriOptions));
+a.features[b].properties[e]=a.features[b].row[e];delete a.features[b].row}}if(this instanceof gvector.GISCloud){a.features=a.data;delete a.data;b=0;for(d=a.features.length;b<d;b++)a.features[b].type="Feature",a.features[b].properties=a.features[b].data,a.features[b].properties.id=a.features[b].__id,delete a.features[b].data,a.features[b].geometry=a.features[b].__geometry,delete a.features[b].__geometry}if(a&&a.features&&a.features.length)for(b=0;b<a.features.length;b++){if(this instanceof gvector.EsriJSONLayer)a.features[b].properties=
+a.features[b].attributes,delete a.features[b].attributes;e=!1;if(this.options.uniqueField)for(var c=0;c<this._vectors.length;c++)if(a.features[b].properties[this.options.uniqueField]==this._vectors[c].properties[this.options.uniqueField]&&(e=!0,this.options.dynamic)){if(this._getGeometryChanged(this._vectors[c].geometry,a.features[b].geometry)&&!isNaN(a.features[b].geometry.x||a.features[b].geometry.coordinates[0])&&!isNaN(a.features[b].geometry.y||a.features[b].geometry.coordinates[1]))this._vectors[c].geometry=
+a.features[b].geometry,this._vectors[c].vector.setPosition(new google.maps.LatLng(a.features[b].geometry.y||this._vectors[c].geometry.coordinates[1],a.features[b].geometry.x||this._vectors[c].geometry.coordinates[0]));if(this._getPropertiesChanged(this._vectors[c].properties,a.features[b].properties)&&(this._vectors[c].properties=a.features[b].properties,this.options.infoWindowTemplate&&this._setInfoWindowContent(this._vectors[c]),this.options.symbology&&this.options.symbology.type!="single"))if(this._vectors[c].vector)this._vectors[c].vector.setOptions(this._getFeatureVectorOptions(this._vectors[c]));
+else if(this._vectors[c].vectors)for(var f=0,d=this._vectors[c].vectors.length;f<d;f++)this._vectors[c].vectors[f].setOptions(this._getFeatureVectorOptions(this._vectors[c]))}if(!e||!this.options.uniqueField){this instanceof gvector.GeoJSONLayer?(d=this._geoJsonGeometryToGoogle(a.features[b].geometry,this._getFeatureVectorOptions(a.features[b])),a.features[b][d instanceof Array?"vectors":"vector"]=d):this instanceof gvector.EsriJSONLayer&&(d=this._esriJsonGeometryToGoogle(a.features[b].geometry,this._getFeatureVectorOptions(a.features[b])),
+a.features[b][d instanceof Array?"vectors":"vector"]=d);if(a.features[b].vector)a.features[b].vector.setMap(this.options.map);else if(a.features[b].vectors&&a.features[b].vectors.length)for(f=0;f<a.features[b].vectors.length;f++)a.features[b].vectors[f].setMap(this.options.map);this._vectors.push(a.features[b]);if(this.options.infoWindowTemplate){var g=this,d=a.features[b];this._setInfoWindowContent(d);(function(a){if(a.vector)google.maps.event.addListener(a.vector,"click",function(b){g._showInfoWindow(a,
+b)});else if(a.vectors)for(var b=0,c=a.vectors.length;b<c;b++)google.maps.event.addListener(a.vectors[b],"click",function(b){g._showInfoWindow(a,b)})})(d)}}}}}}});gvector.GeoJSONLayer=gvector.Layer.extend({_geoJsonGeometryToGoogle:function(a,b){var d,e;switch(a.type){case "Point":b.position=new google.maps.LatLng(a.coordinates[1],a.coordinates[0]);d=new google.maps.Marker(b);break;case "MultiPoint":e=[];for(var c=0,f=a.coordinates.length;c<f;c++)b.position=new google.maps.LatLng(a.coordinates[c][1],a.coordinates[c][0]),e.push(new google.maps.Marker(b));break;case "LineString":for(var g=[],c=0,f=a.coordinates.length;c<f;c++){var h=new google.maps.LatLng(a.coordinates[c][1],
+a.coordinates[c][0]);g.push(h)}b.path=g;d=new google.maps.Polyline(b);break;case "MultiLineString":e=[];c=0;for(f=a.coordinates.length;c<f;c++){for(var g=[],i=0,j=a.coordinates[c].length;i<j;i++){var k=a.coordinates[c][i],h=new google.maps.LatLng(k[1],k[0]);g.push(h)}b.path=g;e.push(new google.maps.Polyline(b))}break;case "Polygon":k=[];c=0;for(f=a.coordinates.length;c<f;c++){g=[];i=0;for(j=a.coordinates[c].length;i<j;i++)h=new google.maps.LatLng(a.coordinates[c][i][1],a.coordinates[c][i][0]),g.push(h);
+k.push(g)}b.paths=k;d=new google.maps.Polygon(b);break;case "MultiPolygon":e=[];c=0;for(f=a.coordinates.length;c<f;c++){k=[];i=0;for(j=a.coordinates[c].length;i<j;i++){for(var g=[],h=0,l=a.coordinates[c][i].length;h<l;h++)g.push(new google.maps.LatLng(a.coordinates[c][i][h][1],a.coordinates[c][i][h][0]));k.push(g)}b.paths=k;e.push(new google.maps.Polygon(b))}break;case "GeometryCollection":e=[];c=0;for(f=a.geometries.length;c<f;c++)e.push(this._geoJsonGeometryToGoogle(a.geometries[c],b))}return d||
+e}});gvector.EsriJSONLayer=gvector.Layer.extend({_esriJsonGeometryToGoogle:function(a,b){var d,e;if(a.x&&a.y)b.position=new google.maps.LatLng(a.y,a.x),d=new google.maps.Marker(b);else if(a.points){e=[];for(var c=0,f=a.points.length;c<f;c++)b.position=new google.maps.LatLng(a.points[c].y,a.points[c].x),e.push(new google.maps.Marker(b))}else if(a.paths)if(a.paths.length>1){e=[];c=0;for(f=a.paths.length;c<f;c++){for(var g=[],h=0,i=a.paths[c].length;h<i;h++)g.push(new google.maps.LatLng(a.paths[c][h][1],
+a.paths[c][h][0]));b.path=g;e.push(new google.maps.Polyline(b))}}else{g=[];c=0;for(f=a.paths[0].length;c<f;c++)g.push(new google.maps.LatLng(a.paths[0][c][1],a.paths[0][c][0]));b.path=g;d=new google.maps.Polyline(b)}else if(a.rings)if(a.rings.length>1){e=[];c=0;for(f=a.rings.length;c<f;c++){for(var j=[],g=[],h=0,i=a.rings[c].length;h<i;h++)g.push(new google.maps.LatLng(a.rings[c][h][1],a.rings[c][h][0]));j.push(g);b.paths=j;e.push(new google.maps.Polygon(b))}}else{j=[];g=[];c=0;for(f=a.rings[0].length;c<
+f;c++)g.push(new google.maps.LatLng(a.rings[0][c][1],a.rings[0][c][0]));j.push(g);b.paths=j;d=new google.maps.Polygon(b)}return d||e}});gvector.AGS=gvector.EsriJSONLayer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');this._globalPointer="AGS_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;a.url.substr(a.url.length-1,1)!=="/"&&(a.url+="/");this._originalOptions=gvector.Util.extend({},a);if(a.esriOptions)if(typeof a.esriOptions=="object")gvector.Util.extend(a,this._convertEsriOptions(a.esriOptions));
 else{this._getEsriOptions();return}gvector.Layer.prototype.initialize.call(this,a);if(this.options.where)this.options.where=encodeURIComponent(this.options.where);this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{where:"1=1",url:null,useEsriOptions:!1},_requiredParams:["url"],_convertEsriOptions:function(a){var b=
 {};if(!(a.minScale==void 0||a.maxScale==void 0)){var d=this._scaleToLevel(a.minScale),e=this._scaleToLevel(a.maxScale);e==0&&(e=20);b.scaleRange=[d,e]}if(a.drawingInfo&&a.drawingInfo.renderer)b.symbology=this._renderOptionsToSymbology(a.drawingInfo.renderer);return b},_getEsriOptions:function(){this._makeJsonpRequest(this._originalOptions.url+"?f=json&callback="+this._globalPointer+"._processEsriOptions")},_processEsriOptions:function(a){var b=this._originalOptions;b.esriOptions=a;this.initialize(b)},
 _scaleToLevel:function(a){var b=[5.91657527591555E8,2.95828763795777E8,1.47914381897889E8,7.3957190948944E7,3.6978595474472E7,1.8489297737236E7,9244648.868618,4622324.434309,2311162.217155,1155581.108577,577790.554289,288895.277144,144447.638572,72223.819286,36111.909643,18055.954822,9027.977411,4513.988705,2256.994353,1128.497176,564.248588,282.124294];if(a==0)return 0;for(var d=0,e=0;e<b.length-1;e++){var c=b[e+1];if(a<=b[e]&&a>c){d=e;break}}return d},_renderOptionsToSymbology:function(a){symbology=
@@ -44,11 +44,12 @@ break;case "esriSFS":a.outline?(b.strokeWeight=a.outline.width,b.strokeColor=thi
 this._pad(green.toString(16))+this._pad(blue.toString(16))},_normalize:function(a){return a<1&&a>0?Math.floor(a*255):a},_pad:function(a){return a.length>1?a.toUpperCase():"0"+a.toUpperCase()},_parseAlpha:function(a){return a/255},_getFeatures:function(){this.options.uniqueField||this._clearFeatures();var a=this.options.url+"query?returnGeometry=true&outSR=4326&f=json&outFields="+this.options.fields+"&where="+this.options.where+"&callback="+this._globalPointer+"._processFeatures";this.options.showAll||
 (a+="&inSR=4326&spatialRel=esriSpatialRelIntersects&geometryType=esriGeometryEnvelope&geometry="+this._buildBoundsString(this.options.map.getBounds()));this._makeJsonpRequest(a)}});gvector.A2E=gvector.AGS.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');this._globalPointer="A2E_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;a.url.substr(a.url.length-1,1)!=="/"&&(a.url+="/");this._originalOptions=gvector.Util.extend({},a);if(a.esriOptions)if(typeof a.esriOptions=="object")gvector.Util.extend(a,this._convertEsriOptions(a.esriOptions));
 else{this._getEsriOptions();return}gvector.Layer.prototype.initialize.call(this,a);if(this.options.where)this.options.where=encodeURIComponent(this.options.where);this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}if(this.options.autoUpdate&&this.options.esriOptions.editFeedInfo){this._makeJsonpRequest("http://cdn.pubnub.com/pubnub-3.1.min.js");
-var e=this;this._pubNubScriptLoaderInterval=setInterval(function(){window.PUBNUB&&e._pubNubScriptLoaded()},200)}},_pubNubScriptLoaded:function(){clearInterval(this._pubNubScriptLoaderInterval);this.pubNub=PUBNUB.init({subscribe_key:this.options.esriOptions.editFeedInfo.pubnubSubscribeKey,ssl:!1,origin:"pubsub.pubnub.com"});var a=this;this.pubNub.subscribe({channel:this.options.esriOptions.editFeedInfo.pubnubChannel,callback:function(){a._getFeatures()},error:function(){}})}});gvector.GeoIQ=gvector.Layer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="GeoIQ_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),
-b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{dataset:null},_requiredParams:["dataset"],_getFeatures:function(){this.options.uniqueField||this._clearFeatures();var a="http://geocommons.com/datasets/"+this.options.dataset+"/features.json?geojson=1&callback="+this._globalPointer+"._processFeatures&limit=999";this.options.showAll||(a+="&bbox="+this._buildBoundsString(this.options.map.getBounds())+"&intersect=full");this._makeJsonpRequest(a)}});gvector.CartoDB=gvector.Layer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="CartoDB_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),
-b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{version:1,user:null,table:null,fields:"*",where:null,limit:null,uniqueField:"cartodb_id"},_requiredParams:["user","table"],_getFeatures:function(){var a=this.options.where||"";if(!this.options.showAll)for(var b=this.options.map.getBounds(),d=b.getSouthWest(),b=b.getNorthEast(),e=this.options.table.split(",").length,c=0;c<e;c++)a+=(a.length?" AND ":"")+(e>1?this.options.table.split(",")[c].split(".")[0]+
-".the_geom":"the_geom")+" && st_setsrid(st_makebox2d(st_point("+d.lng()+","+d.lat()+"),st_point("+b.lng()+","+b.lat()+")),4326)";this.options.limit&&(a+=(a.length?" ":"")+"limit "+this.options.limit);a=a.length?" "+a:"";this._makeJsonpRequest("http://"+this.options.user+".cartodb.com/api/v"+this.options.version+"/sql?q="+encodeURIComponent("SELECT "+this.options.fields+" FROM "+this.options.table+(a.length?" WHERE "+a:""))+"&format=geojson&callback="+this._globalPointer+"._processFeatures")}});gvector.PRWSF=gvector.Layer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');a.url.substr(a.url.length-1,1)!=="/"&&(a.url+="/");gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="PRWSF_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&
-this.options.scaleRange.length===2)a=this.options.map.getZoom(),b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{geotable:null,srid:null,geomFieldName:"the_geom",fields:"",where:null,limit:null,uniqueField:null},_requiredParams:["url","geotable"],_getFeatures:function(){var a=this.options.where||"";if(!this.options.showAll){var b=this.options.map.getBounds(),d=b.getSouthWest(),b=b.getNorthEast();a+=a.length?" AND ":"";a+=this.options.srid?this.options.geomFieldName+
+var e=this;this._pubNubScriptLoaderInterval=setInterval(function(){window.PUBNUB&&e._pubNubScriptLoaded()},200)}},_pubNubScriptLoaded:function(){clearInterval(this._pubNubScriptLoaderInterval);this.pubNub=PUBNUB.init({subscribe_key:this.options.esriOptions.editFeedInfo.pubnubSubscribeKey,ssl:!1,origin:"pubsub.pubnub.com"});var a=this;this.pubNub.subscribe({channel:this.options.esriOptions.editFeedInfo.pubnubChannel,callback:function(){a._getFeatures()},error:function(){}})}});gvector.GeoIQ=gvector.GeoJSONLayer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="GeoIQ_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),
+b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{dataset:null},_requiredParams:["dataset"],_getFeatures:function(){this.options.uniqueField||this._clearFeatures();var a="http://geocommons.com/datasets/"+this.options.dataset+"/features.json?geojson=1&callback="+this._globalPointer+"._processFeatures&limit=999";this.options.showAll||(a+="&bbox="+this._buildBoundsString(this.options.map.getBounds())+"&intersect=full");this._makeJsonpRequest(a)}});gvector.CartoDB=gvector.GeoJSONLayer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="CartoDB_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=
+this.options.map.getZoom(),b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{version:1,user:null,table:null,fields:"*",where:null,limit:null,uniqueField:"cartodb_id"},_requiredParams:["user","table"],_getFeatures:function(){var a=this.options.where||"";if(!this.options.showAll)for(var b=this.options.map.getBounds(),d=b.getSouthWest(),b=b.getNorthEast(),e=this.options.table.split(",").length,c=0;c<e;c++)a+=(a.length?" AND ":"")+(e>1?this.options.table.split(",")[c].split(".")[0]+
+".the_geom":"the_geom")+" && st_setsrid(st_makebox2d(st_point("+d.lng()+","+d.lat()+"),st_point("+b.lng()+","+b.lat()+")),4326)";this.options.limit&&(a+=(a.length?" ":"")+"limit "+this.options.limit);a=a.length?" "+a:"";this._makeJsonpRequest("http://"+this.options.user+".cartodb.com/api/v"+this.options.version+"/sql?q="+encodeURIComponent("SELECT "+this.options.fields+" FROM "+this.options.table+(a.length?" WHERE "+a:""))+"&format=geojson&callback="+this._globalPointer+"._processFeatures")}});gvector.PRWSF=gvector.GeoJSONLayer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');a.url.substr(a.url.length-1,1)!=="/"&&(a.url+="/");gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="PRWSF_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof
+Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{geotable:null,srid:null,geomFieldName:"the_geom",fields:"",where:null,limit:null,uniqueField:null},_requiredParams:["url","geotable"],_getFeatures:function(){var a=this.options.where||"";if(!this.options.showAll){var b=this.options.map.getBounds(),d=b.getSouthWest(),b=b.getNorthEast();a+=a.length?" AND ":"";a+=this.options.srid?this.options.geomFieldName+
 " && transform(st_setsrid(st_makebox2d(st_point("+d.lng()+","+d.lat()+"),st_point("+b.lng()+","+b.lat()+")),4326),"+this.options.srid+")":"transform("+this.options.geomFieldName+",4326) && st_setsrid(st_makebox2d(st_point("+d.lng()+","+d.lat()+"),st_point("+b.lng()+","+b.lat()+")),4326)"}this.options.limit&&(a+=(a.length?" ":"")+"limit "+this.options.limit);d=(this.options.fields.length?this.options.fields+",":"")+"st_asgeojson(transform("+this.options.geomFieldName+",4326)) as geojson";this._makeJsonpRequest(this.options.url+
-"v1/ws_geo_attributequery.php?parameters="+encodeURIComponent(a)+"&geotable="+this.options.geotable+"&fields="+encodeURIComponent(d)+"&format=json&callback="+this._globalPointer+"._processFeatures")}});gvector.GISCloud=gvector.Layer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="GISCloud_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=this.options.map.getZoom(),
-b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{mapID:null,layerID:null,uniqueField:"id"},_requiredParams:["mapID","layerID"],_getFeatures:function(){var a="http://api.giscloud.com/1/maps/"+this.options.mapID+"/layers/"+this.options.layerID+"/features.json?geometry=geojson&epsg=4326&callback="+this._globalPointer+"._processFeatures";this.options.showAll||(a+="&bounds="+this._buildBoundsString(this.options.map.getBounds()));this._makeJsonpRequest(a)}});
+"v1/ws_geo_attributequery.php?parameters="+encodeURIComponent(a)+"&geotable="+this.options.geotable+"&fields="+encodeURIComponent(d)+"&format=json&callback="+this._globalPointer+"._processFeatures")}});gvector.GISCloud=gvector.GeoJSONLayer.extend({initialize:function(a){for(var b=0,d=this._requiredParams.length;b<d;b++)if(!a[this._requiredParams[b]])throw Error('No "'+this._requiredParams[b]+'" parameter found.');gvector.Layer.prototype.initialize.call(this,a);this._globalPointer="GISCloud_"+Math.floor(Math.random()*1E5);window[this._globalPointer]=this;this._vectors=[];if(this.options.map){if(this.options.scaleRange&&this.options.scaleRange instanceof Array&&this.options.scaleRange.length===2)a=
+this.options.map.getZoom(),b=this.options.scaleRange,this.options.visibleAtScale=a>=b[0]&&a<=b[1];this._show()}},options:{mapID:null,layerID:null,uniqueField:"id"},_requiredParams:["mapID","layerID"],_getFeatures:function(){var a="http://api.giscloud.com/1/maps/"+this.options.mapID+"/layers/"+this.options.layerID+"/features.json?geometry=geojson&epsg=4326&callback="+this._globalPointer+"._processFeatures";this.options.showAll||(a+="&bounds="+this._buildBoundsString(this.options.map.getBounds()));
+this._makeJsonpRequest(a)}});
diff --git a/src/layer/AGS.js b/src/layer/AGS.js
index 1c020d0..6e9d182 100644
--- a/src/layer/AGS.js
+++ b/src/layer/AGS.js
@@ -1,4 +1,4 @@
-gvector.AGS = gvector.Layer.extend({
+gvector.AGS = gvector.EsriJSONLayer.extend({
     initialize: function(options) {
         
         // Check for required parameters
diff --git a/src/layer/CartoDB.js b/src/layer/CartoDB.js
index 308b610..e69b7f3 100644
--- a/src/layer/CartoDB.js
+++ b/src/layer/CartoDB.js
@@ -1,4 +1,4 @@
-gvector.CartoDB = gvector.Layer.extend({
+gvector.CartoDB = gvector.GeoJSONLayer.extend({
     initialize: function(options) {
         
         // Check for required parameters
diff --git a/src/layer/GISCloud.js b/src/layer/GISCloud.js
index 6cd65dc..9d81cf2 100644
--- a/src/layer/GISCloud.js
+++ b/src/layer/GISCloud.js
@@ -1,4 +1,4 @@
-gvector.GISCloud = gvector.Layer.extend({
+gvector.GISCloud = gvector.GeoJSONLayer.extend({
     initialize: function(options) {
         
         // Check for required parameters
diff --git a/src/layer/GeoIQ.js b/src/layer/GeoIQ.js
index 682c65f..c65dd0b 100644
--- a/src/layer/GeoIQ.js
+++ b/src/layer/GeoIQ.js
@@ -1,4 +1,4 @@
-gvector.GeoIQ = gvector.Layer.extend({
+gvector.GeoIQ = gvector.GeoJSONLayer.extend({
     initialize: function(options) {
         
         // Check for required parameters
diff --git a/src/layer/Layer.js b/src/layer/Layer.js
index ccf926f..7ec4734 100644
--- a/src/layer/Layer.js
+++ b/src/layer/Layer.js
@@ -489,175 +489,6 @@ gvector.Layer = gvector.Class.extend({
         return changed;
     },
     
-    //
-    // Turn EsriJSON into Google Maps API vectors
-    //
-    _esriJsonGeometryToGoogle: function(geometry, opts) {
-        //
-        // Create a variable for a single vector and for multi part vectors. The Google Maps API has no real support for these so we keep them in an array.
-        //
-        var vector, vectors;
-        
-        if (geometry.x && geometry.y) {
-            //
-            // A Point
-            //
-            opts.position = new google.maps.LatLng(geometry.y, geometry.x);
-            vector = new google.maps.Marker(opts);
-        } else if (geometry.points) {
-            //
-            // A MultiPoint
-            //
-            vectors = [];
-            for (var i = 0, len = geometry.points.length; i < len; i++) {
-                opts.position = new google.maps.LatLng(geometry.points[i].y, geometry.points[i].x);
-                vectors.push(new google.maps.Marker(opts));
-            }
-        } else if (geometry.paths) {
-            if (geometry.paths.length > 1) {
-                //
-                // A MultiLineString
-                //
-                vectors = [];
-                for (var i = 0, len = geometry.paths.length; i < len; i++) {
-                    var path = [];
-                    for (var i2 = 0, len2 = geometry.paths[i].length; i2 < len2; i2++) {
-                        path.push(new google.maps.LatLng(geometry.paths[i][i2][1], geometry.paths[i][i2][0]));
-                    }
-                    opts.path = path
-                    vectors.push(new google.maps.Polyline(opts));
-                }
-            } else {
-                //
-                // A LineString
-                //
-                var path = [];
-                for (var i = 0, len = geometry.paths[0].length; i < len; i++) {
-                    path.push(new google.maps.LatLng(geometry.paths[0][i][1], geometry.paths[0][i][0]));
-                }
-                opts.path = path;
-                vector = new google.maps.Polyline(opts);
-            }
-        } else if (geometry.rings) {
-            if (geometry.rings.length > 1) {
-                //
-                // A MultiPolygon
-                //
-                vectors = [];
-                for (var i = 0, len = geometry.rings.length; i < len; i++) {
-                    var paths = [];
-                    var path = [];
-                    for (var i2 = 0, len2 = geometry.rings[i].length; i2 < len2; i2++) {
-                        path.push(new google.maps.LatLng(geometry.rings[i][i2][1], geometry.rings[i][i2][0]));
-                    }
-                    paths.push(path);
-                    opts.paths = paths;
-                    vectors.push(new google.maps.Polygon(opts));
-                }
-            } else {
-                //
-                // A Polygon
-                //
-                var paths = [];
-                var path = [];
-                for (var i = 0, len = geometry.rings[0].length; i < len; i++) {
-                    path.push(new google.maps.LatLng(geometry.rings[0][i][1], geometry.rings[0][i][0]));
-                }
-                paths.push(path);
-                opts.paths = paths;
-                vector = new google.maps.Polygon(opts);
-            }
-        }
-        return vector || vectors;
-    },
-    
-    //
-    // Convert GeoJSON to Google Maps API vectors using portions of https://github.com/JasonSanford/GeoJSON-to-Google-Maps
-    //
-    _geoJsonGeometryToGoogle: function(geometry, opts) {
-        //
-        // Create a variable for a single vector and for multi part vectors. The Google Maps API has no real support for these so we keep them in an array.
-        //
-        var vector, vectors;
-        
-        switch (geometry.type) {
-            case "Point":
-                opts.position = new google.maps.LatLng(geometry.coordinates[1], geometry.coordinates[0]);
-                vector = new google.maps.Marker(opts);
-                break;
-            
-            case "MultiPoint":
-                vectors = [];
-                for (var i = 0, len = geometry.coordinates.length; i < len; i++) {
-                    opts.position = new google.maps.LatLng(geometry.coordinates[i][1], geometry.coordinates[i][0]);
-                    vectors.push(new google.maps.Marker(opts));
-                }
-                break;
-                        
-            case "LineString":
-                var path = [];
-                for (var i = 0, len = geometry.coordinates.length; i < len; i++) {
-                    var ll = new google.maps.LatLng(geometry.coordinates[i][1], geometry.coordinates[i][0]);
-                    path.push(ll);
-                }
-                opts.path = path;
-                vector = new google.maps.Polyline(opts);
-                break;
-            
-            case "MultiLineString":
-                vectors = [];
-                for (var i = 0, len = geometry.coordinates.length; i < len; i++){
-                    var path = [];
-                    for (var i2 = 0, len2 = geometry.coordinates[i].length; i2 < len2; i2++){
-                        var coord = geometry.coordinates[i][i2];
-                        var ll = new google.maps.LatLng(coord[1], coord[0]);
-                        path.push(ll);
-                    }
-                    opts.path = path;
-                    vectors.push(new google.maps.Polyline(opts));
-                }
-                break;
-                
-            case "Polygon":
-                var paths = [];
-                for (var i = 0, len = geometry.coordinates.length; i < len; i++) {
-                    var path = [];
-                    for (var i2 = 0, len2 = geometry.coordinates[i].length; i2 < len2; i2++) {
-                            var ll = new google.maps.LatLng(geometry.coordinates[i][i2][1], geometry.coordinates[i][i2][0]);
-                        path.push(ll);
-                    }
-                    paths.push(path);
-                }
-                opts.paths = paths;
-                vector = new google.maps.Polygon(opts);
-                break;
-            
-            case "MultiPolygon":
-                vectors = [];
-                for (var i = 0, len = geometry.coordinates.length; i < len; i++) {
-                    paths = [];
-                    for (var i2 = 0, len2 = geometry.coordinates[i].length; i2 < len2; i2++) {
-                        var path = [];
-                        for (var i3 = 0, len3 = geometry.coordinates[i][i2].length; i3 < len3; i3++) {
-                            path.push(new google.maps.LatLng(geometry.coordinates[i][i2][i3][1], geometry.coordinates[i][i2][i3][0]));
-                        }
-                        paths.push(path);
-                    }
-                    opts.paths = paths;
-                    vectors.push(new google.maps.Polygon(opts));
-                }
-                break;
-                
-            case "GeometryCollection":
-                vectors = [];
-                for (var i = 0, len = geometry.geometries.length; i < len; i++) {
-                    vectors.push(this._geoJsonGeometryToGoogle(geometry.geometries[i], opts));
-                }
-                break;
-        }
-        return vector || vectors;
-    },
-    
     _makeJsonpRequest: function(url) {
         var head = document.getElementsByTagName("head")[0];
         var script = document.createElement("script");
@@ -730,7 +561,7 @@ gvector.Layer = gvector.Class.extend({
             for (var i = 0; i < data.features.length; i++) {
             
                 // if AGS layer type assigned "attributes" to "properties" to keep everything looking like GeoJSON Features
-                if (this instanceof gvector.AGS || this instanceof gvector.A2E) {
+                if (this instanceof gvector.EsriJSONLayer) {
                     data.features[i].properties = data.features[i].attributes;
                     delete data.features[i].attributes;
                 }
@@ -792,11 +623,11 @@ gvector.Layer = gvector.Class.extend({
                 // If the feature isn't already or the map OR the "uniqueField" attribute doesn't exist
                 if (!onMap || !this.options.uniqueField) {
                     
-                    if (this instanceof gvector.CartoDB || this instanceof gvector.GeoIQ || this instanceof gvector.PRWSF || this instanceof gvector.GISCloud) {
+                    if (this instanceof gvector.GeoJSONLayer) {
                         // Convert GeoJSON to Google Maps vector (Point, Polyline, Polygon)
                         var vector_or_vectors = this._geoJsonGeometryToGoogle(data.features[i].geometry, this._getFeatureVectorOptions(data.features[i]));
                         data.features[i][vector_or_vectors instanceof Array ? "vectors" : "vector"] = vector_or_vectors;
-                    } else if (this instanceof gvector.AGS || this instanceof gvector.A2E) {
+                    } else if (this instanceof gvector.EsriJSONLayer) {
                         // Convert Esri JSON to Google Maps vector (Point, Polyline, Polygon)
                         var vector_or_vectors = this._esriJsonGeometryToGoogle(data.features[i].geometry, this._getFeatureVectorOptions(data.features[i]));
                         data.features[i][vector_or_vectors instanceof Array ? "vectors" : "vector"] = vector_or_vectors;
diff --git a/src/layer/PRWSF.js b/src/layer/PRWSF.js
index 433afba..5e02611 100644
--- a/src/layer/PRWSF.js
+++ b/src/layer/PRWSF.js
@@ -1,4 +1,4 @@
-gvector.PRWSF = gvector.Layer.extend({
+gvector.PRWSF = gvector.GeoJSONLayer.extend({
     initialize: function(options) {
         
         // Check for required parameters