diff --git a/build/build.bat b/build/build.bat
index 7a2346b..4d39844 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -1,6 +1,6 @@
 @echo off
 java -jar ../lib/closure-compiler/compiler.jar ^
---js ../src/gvector.js ^
+--js ../src/lvector.js ^
 --js ../src/core/Util.js ^
 --js ../src/core/Class.js ^
 --js ../src/layer/Layer.js ^
@@ -12,4 +12,4 @@ java -jar ../lib/closure-compiler/compiler.jar ^
 --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
+--js_output_file ../dist/lvector.js
diff --git a/dist/lvector.js b/dist/lvector.js
index 4f75865..4b4432e 100644
--- a/dist/lvector.js
+++ b/dist/lvector.js
@@ -34,19 +34,19 @@ this._vectors.push(a.features[b]);if(this.options.popupTemplate){var g=this;c=a.
 [];e=0;for(f=a.coordinates.length;e<f;e++){for(var g=[],h=0,j=a.coordinates[e].length;h<j;h++)g.push(new L.LatLng(a.coordinates[e][h][1],a.coordinates[e][h][0]));c.push(new L.Polyline(g,b))}break;case "Polygon":for(var i=[],e=0,f=a.coordinates.length;e<f;e++){g=[];h=0;for(j=a.coordinates[e].length;h<j;h++)g.push(new L.LatLng(a.coordinates[e][h][1],a.coordinates[e][h][0]));i.push(g)}d=new L.Polygon(i,b);break;case "MultiPolygon":c=[];e=0;for(f=a.coordinates.length;e<f;e++){i=[];h=0;for(j=a.coordinates[e].length;h<
 j;h++){for(var g=[],k=0,l=a.coordinates[e][h].length;k<l;k++)g.push(new L.LatLng(a.coordinates[e][h][k][1],a.coordinates[e][h][k][0]));i.push(g)}c.push(new L.Polygon(i,b))}break;case "GeometryCollection":c=[];e=0;for(f=a.geometries.length;e<f;e++)c.push(this._geoJsonGeometryToLeaflet(a.geometries[e],b))}return d||c}});lvector.EsriJSONLayer=lvector.Layer.extend({_esriJsonGeometryToLeaflet:function(a,b){var d,c;if(a.x&&a.y)d=new L.Marker(new L.LatLng(a.y,a.x),b);else if(a.points){c=[];for(var e=0,f=a.points.length;e<f;e++)c.push(new L.Marker(new L.LatLng(a.points[e].y,a.points[e].x),b))}else if(a.paths)if(a.paths.length>1){c=[];e=0;for(f=a.paths.length;e<f;e++){for(var g=[],h=0,j=a.paths[e].length;h<j;h++)g.push(new L.LatLng(a.paths[e][h][1],a.paths[e][h][0]));c.push(new L.Polyline(g,b))}}else{g=[];e=0;for(f=a.paths[0].length;e<
 f;e++)g.push(new L.LatLng(a.paths[0][e][1],a.paths[0][e][0]));d=new L.Polyline(g,b)}else if(a.rings)if(a.rings.length>1){c=[];e=0;for(f=a.rings.length;e<f;e++){for(var i=[],g=[],h=0,j=a.rings[e].length;h<j;h++)g.push(new L.LatLng(a.rings[e][h][1],a.rings[e][h][0]));i.push(g);c.push(new L.Polygon(i,b))}}else{i=[];g=[];e=0;for(f=a.rings[0].length;e<f;e++)g.push(new L.LatLng(a.rings[0][e][1],a.rings[0][e][0]));i.push(g);d=new L.Polygon(i,b)}return d||c}});lvector.AGS=lvector.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=lvector.Util.extend({},a);if(a.esriOptions)if(typeof a.esriOptions=="object")lvector.Util.extend(a,this._convertEsriOptions(a.esriOptions));
-else{this._getEsriOptions();return}lvector.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),c=this._scaleToLevel(a.maxScale);c==0&&(c=20);b.scaleRange=[d,c]}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,c=0;c<b.length-1;c++){var e=b[c+1];if(a<=b[c]&&a>e){d=c;break}}return d},_renderOptionsToSymbology:function(a){symbology=
-{};switch(a.type){case "simple":symbology.type="single";symbology.vectorOptions=this._parseSymbology(a.symbol);break;case "uniqueValue":symbology.type="unique";symbology.property=a.field1;for(var b=[],d=0;d<a.uniqueValueInfos.length;d++){var c=a.uniqueValueInfos[d],e={};e.value=c.value;e.vectorOptions=this._parseSymbology(c.symbol);e.label=c.label;b.push(e)}symbology.values=b;break;case "classBreaks":symbology.type="range";symbology.property=rend.field;b=[];c=a.minValue;for(d=0;d<a.classBreakInfos.length;d++){var e=
-a.classBreakInfos[d],f={};f.range=[c,e.classMaxValue];c=e.classMaxValue;f.vectorOptions=this._parseSymbology(e.symbol);f.label=e.label;b.push(f)}symbology.ranges=b}return symbology},_parseSymbology:function(a){var b={};switch(a.type){case "esriSMS":case "esriPMS":a=L.Icon.extend({iconUrl:"data:"+a.contentType+";base64,"+a.imageData,shadowUrl:null,iconSize:new L.Point(a.width,a.height),iconAnchor:new L.Point(a.width/2+a.xoffset,a.height/2+a.yoffset),popupAnchor:new L.Point(0,-(a.height/2))});b.icon=
-new a;break;case "esriSLS":b.weight=a.width;b.color=this._parseColor(a.color);b.opacity=this._parseAlpha(a.color[3]);break;case "esriSFS":a.outline?(b.weight=a.outline.width,b.color=this._parseColor(a.outline.color),b.opacity=this._parseAlpha(a.outline.color[3])):(b.weight=0,b.color="#000000",b.opacity=0),a.style!="esriSFSNull"?(b.fillColor=this._parseColor(a.color),b.fillOpacity=this._parseAlpha(a.color[3])):(b.fillColor="#000000",b.fillOpacity=0)}return b},_parseColor:function(a){red=this._normalize(a[0]);
-green=this._normalize(a[1]);blue=this._normalize(a[2]);return"#"+this._pad(red.toString(16))+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.options.map.getBounds().toBBoxString());this._makeJsonpRequest(a)},_processFeatures:function(a){if(this.options.map){var b=this.options.map.getBounds();if(!this._lastQueriedBounds||!this._lastQueriedBounds.equals(b)||this.options.autoUpdate)if(this._lastQueriedBounds=b,a&&a.features&&a.features.length)for(b=
-0;b<a.features.length;b++){var d=!1;if(this.options.uniqueField)for(var c=0;c<this._vectors.length;c++)if(a.features[b].attributes[this.options.uniqueField]==this._vectors[c].attributes[this.options.uniqueField]&&(d=!0,this.options.dynamic)){if(this._getGeometryChanged(this._vectors[c].geometry,a.features[b].geometry)&&!isNaN(a.features[b].geometry.x)&&!isNaN(a.features[b].geometry.y))this._vectors[c].geometry=a.features[b].geometry,this._vectors[c].vector.setLatLng(new L.LatLng(this._vectors[c].geometry.y,
-this._vectors[c].geometry.x)),this._vectors[c].popup?this._vectors[c].popup.setLatLng(new L.LatLng(this._vectors[c].geometry.y,this._vectors[c].geometry.x)):this.popup&&this.popup.associatedFeature==this._vectors[c]&&this.popup.setLatLng(new L.LatLng(this._vectors[c].geometry.y,this._vectors[c].geometry.x));if(this._getPropertiesChanged(this._vectors[c].attributes,a.features[b].attributes)&&(this._vectors[c].attributes=a.features[b].attributes,this.options.popupTemplate&&this._setPopupContent(this._vectors[c]),
-this.options.symbology&&this.options.symbology.type!="single"))if(this._vectors[c].vectors)for(var e=0,f=this._vectors[c].vectors.length;e<f;e++)this._vectors[c].vectors[e].setStyle?this._vectors[c].vectors[e].setStyle(this._getFeatureVectorOptions(this._vectors[c])):this._vectors[c].vectors[e].setIcon&&this._vectors[c].vectors[e].setIcon(this._getFeatureVectorOptions(this._vectors[c]).icon);else this._vectors[c].vector&&(this._vectors[c].vector.setStyle?this._vectors[c].vector.setStyle(this._getFeatureVectorOptions(this._vectors[c])):
-this._vectors[c].vector.setIcon&&this._vectors[c].vector.setIcon(this._getFeatureVectorOptions(this._vectors[c]).icon))}if(!d||!this.options.uniqueField){d=this._esriJsonGeometryToLeaflet(a.features[b].geometry,this._getFeatureVectorOptions(a.features[b]));a.features[b][d instanceof Array?"vectors":"vector"]=d;if(a.features[b].vector)this.options.map.addLayer(a.features[b].vector);else if(a.features[b].vectors&&a.features[b].vectors.length)for(e=0;e<a.features[b].vectors.length;e++)this.options.map.addLayer(a.features[b].vectors[e]);
-this._vectors.push(a.features[b]);if(this.options.popupTemplate){var g=this,d=a.features[b];this._setPopupContent(d);(function(a){if(a.vector)a.vector.on("click",function(b){g._showPopup(a,b)});else if(a.vectors)for(var b=0,c=a.vectors.length;b<c;b++)a.vectors[b].on("click",function(b){g._showPopup(a,b)})})(d)}}}}}});lvector.A2E=lvector.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=lvector.Util.extend({},a);if(a.esriOptions)if(typeof a.esriOptions=="object")lvector.Util.extend(a,this._convertEsriOptions(a.esriOptions));
+else{this._getEsriOptions();return}lvector.Layer.prototype.initialize.call(this,a);if(this.options.onload&&typeof this.options.onload=="function")this._layerLoaded=this.options.onload;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),c=this._scaleToLevel(a.maxScale);c==0&&(c=20);b.scaleRange=[d,c]}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,c=0;c<b.length-1;c++){var e=b[c+1];if(a<=b[c]&&a>e){d=c;break}}return d},_renderOptionsToSymbology:function(a){symbology={};switch(a.type){case "simple":symbology.type="single";symbology.vectorOptions=this._parseSymbology(a.symbol);break;case "uniqueValue":symbology.type="unique";symbology.property=a.field1;for(var b=[],d=0;d<a.uniqueValueInfos.length;d++){var c=a.uniqueValueInfos[d],e={};e.value=c.value;e.vectorOptions=this._parseSymbology(c.symbol);e.label=c.label;b.push(e)}symbology.values=b;
+break;case "classBreaks":symbology.type="range";symbology.property=rend.field;b=[];c=a.minValue;for(d=0;d<a.classBreakInfos.length;d++){var e=a.classBreakInfos[d],f={};f.range=[c,e.classMaxValue];c=e.classMaxValue;f.vectorOptions=this._parseSymbology(e.symbol);f.label=e.label;b.push(f)}symbology.ranges=b}return symbology},_parseSymbology:function(a){var b={};switch(a.type){case "esriSMS":case "esriPMS":a=L.Icon.extend({iconUrl:"data:"+a.contentType+";base64,"+a.imageData,shadowUrl:null,iconSize:new L.Point(a.width,
+a.height),iconAnchor:new L.Point(a.width/2+a.xoffset,a.height/2+a.yoffset),popupAnchor:new L.Point(0,-(a.height/2))});b.icon=new a;break;case "esriSLS":b.weight=a.width;b.color=this._parseColor(a.color);b.opacity=this._parseAlpha(a.color[3]);break;case "esriSFS":a.outline?(b.weight=a.outline.width,b.color=this._parseColor(a.outline.color),b.opacity=this._parseAlpha(a.outline.color[3])):(b.weight=0,b.color="#000000",b.opacity=0),a.style!="esriSFSNull"?(b.fillColor=this._parseColor(a.color),b.fillOpacity=
+this._parseAlpha(a.color[3])):(b.fillColor="#000000",b.fillOpacity=0)}return b},_parseColor:function(a){red=this._normalize(a[0]);green=this._normalize(a[1]);blue=this._normalize(a[2]);return"#"+this._pad(red.toString(16))+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.options.map.getBounds().toBBoxString());this._makeJsonpRequest(a)},_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;if(a&&a.features&&a.features.length)for(b=0;b<a.features.length;b++){var d=!1;if(this.options.uniqueField)for(var c=0;c<this._vectors.length;c++)if(a.features[b].attributes[this.options.uniqueField]==this._vectors[c].attributes[this.options.uniqueField]&&(d=!0,this.options.dynamic)){if(this._getGeometryChanged(this._vectors[c].geometry,a.features[b].geometry)&&!isNaN(a.features[b].geometry.x)&&!isNaN(a.features[b].geometry.y))this._vectors[c].geometry=
+a.features[b].geometry,this._vectors[c].vector.setLatLng(new L.LatLng(this._vectors[c].geometry.y,this._vectors[c].geometry.x)),this._vectors[c].popup?this._vectors[c].popup.setLatLng(new L.LatLng(this._vectors[c].geometry.y,this._vectors[c].geometry.x)):this.popup&&this.popup.associatedFeature==this._vectors[c]&&this.popup.setLatLng(new L.LatLng(this._vectors[c].geometry.y,this._vectors[c].geometry.x));if(this._getPropertiesChanged(this._vectors[c].attributes,a.features[b].attributes)&&(this._vectors[c].attributes=
+a.features[b].attributes,this.options.popupTemplate&&this._setPopupContent(this._vectors[c]),this.options.symbology&&this.options.symbology.type!="single"))if(this._vectors[c].vectors)for(var e=0,f=this._vectors[c].vectors.length;e<f;e++)this._vectors[c].vectors[e].setStyle?this._vectors[c].vectors[e].setStyle(this._getFeatureVectorOptions(this._vectors[c])):this._vectors[c].vectors[e].setIcon&&this._vectors[c].vectors[e].setIcon(this._getFeatureVectorOptions(this._vectors[c]).icon);else this._vectors[c].vector&&
+(this._vectors[c].vector.setStyle?this._vectors[c].vector.setStyle(this._getFeatureVectorOptions(this._vectors[c])):this._vectors[c].vector.setIcon&&this._vectors[c].vector.setIcon(this._getFeatureVectorOptions(this._vectors[c]).icon))}if(!d||!this.options.uniqueField){d=this._esriJsonGeometryToLeaflet(a.features[b].geometry,this._getFeatureVectorOptions(a.features[b]));a.features[b][d instanceof Array?"vectors":"vector"]=d;if(a.features[b].vector)this.options.map.addLayer(a.features[b].vector);else if(a.features[b].vectors&&
+a.features[b].vectors.length)for(e=0;e<a.features[b].vectors.length;e++)this.options.map.addLayer(a.features[b].vectors[e]);this._vectors.push(a.features[b]);if(this.options.popupTemplate){var g=this,d=a.features[b];this._setPopupContent(d);(function(a){if(a.vector)a.vector.on("click",function(b){g._showPopup(a,b)});else if(a.vectors)for(var b=0,c=a.vectors.length;b<c;b++)a.vectors[b].on("click",function(b){g._showPopup(a,b)})})(d)}}}typeof this._layerLoaded=="function"&&this._layerLoaded(a)}}},_layerLoaded:function(){}});lvector.A2E=lvector.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=lvector.Util.extend({},a);if(a.esriOptions)if(typeof a.esriOptions=="object")lvector.Util.extend(a,this._convertEsriOptions(a.esriOptions));
 else{this._getEsriOptions();return}lvector.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 c=this;this._pubNubScriptLoaderInterval=setInterval(function(){window.PUBNUB&&c._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(){}})}});lvector.GeoIQ=lvector.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.');lvector.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.options.map.getBounds().toBBoxString()+"&intersect=full");this._makeJsonpRequest(a)},_processFeatures:function(a){if(this.options.map){var a=
diff --git a/src/layer/AGS.js b/src/layer/AGS.js
index 6bc53ad..721eb8c 100644
--- a/src/layer/AGS.js
+++ b/src/layer/AGS.js
@@ -34,6 +34,10 @@ lvector.AGS = lvector.EsriJSONLayer.extend({
         // Extend Layer to create AGS
         lvector.Layer.prototype.initialize.call(this, options);
         
+        if (this.options.onload && typeof this.options.onload == 'function') {
+            this._layerLoaded = this.options.onload;
+        }
+        
         if (this.options.where) {
             this.options.where = encodeURIComponent(this.options.where);
         }
@@ -387,7 +391,14 @@ lvector.AGS = lvector.EsriJSONLayer.extend({
             }
             
         }
+        
+        if (typeof this._layerLoaded == 'function') {
+            this._layerLoaded(data);
+        }
     
-    }
+    },
     
+    _layerLoaded: function(data) {
+        // do nothing by default
+    }
 });