diff --git a/Gruntfile.js b/Gruntfile.js
index 29a4f43f3..b7b69b9c3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -84,6 +84,8 @@ module.exports = function(grunt) {
           'src/Services/FeatureLayer.js',
           'src/Services/MapService.js',
           'src/Services/ImageService.js',
+          'src/Tasks/Query.js',
+          'src/Tasks/Find.js',
           'src/Tasks/Identify.js',
           'src/Tasks/IdentifyImage.js',
           'src/Tasks/IdentifyFeatures.js',
diff --git a/bower.json b/bower.json
index 8d73aab7e..304a7b1dd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "esri-leaflet",
-  "version": "0.0.1-beta.5",
+  "version": "v0.0.1-beta.6",
   "main": "dist/esri-leaflet.js",
   "ignore": [
     "**/.*",
diff --git a/site/source/pages/download/index.md b/site/source/pages/download/index.md
index 0ce4d8432..9deb72a36 100644
--- a/site/source/pages/download/index.md
+++ b/site/source/pages/download/index.md
@@ -8,7 +8,7 @@ class: no-sidebar
 
 All builds of Esri Leaflet are available for download on [GitHub](https://github.com/Esri/esri-leaflet/releases/).
 
-<a href="https://github.com/Esri/esri-leaflet/releases/download/v0.0.1-beta.5/esri-leaflet-v0.0.1-beta.5.zip" class="btn">Current Release</a>
+<a href="https://github.com/Esri/esri-leaflet/releases/download/v0.0.1-beta.6/esri-leaflet-v0.0.1-beta.6.zip" class="btn">Current Release</a>
 <a href="https://github.com/Esri/esri-leaflet/releases/" class="btn">Past Releases</a>
 
 # CDN
@@ -18,7 +18,7 @@ Esri Leaflet is currently hosted on Amazon Cloudfront to make it easily availabl
 #### Standard Build
 
 ```xml
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet.js"></script>
 ```
 
 #### Other Builds
@@ -27,26 +27,26 @@ Esri Leaflet is also built into several smaller components and plugins for speci
 
 ```xml
 <!-- Core Build -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet-core.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet-core.js"></script>
 
 <!-- Basemaps Only Build -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet-basemaps.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet-basemaps.js"></script>
 
 <!-- Feature Layer Only Build -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet-feature-layer.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet-feature-layer.js"></script>
 
 <!-- Map Service Only Build -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet-map-service.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet-map-service.js"></script>
 
 <!-- Heatmap Feature Layer -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet-heatmap-feature-layer.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet-heatmap-feature-layer.js"></script>
 
 <!-- Clustered Feature Layer -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet-clustered-feature-layer.js"></script>
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.6/esri-leaflet-clustered-feature-layer.js"></script>
 
 <!-- Geocoding Control -->
-<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet-geocoder/0.0.1-beta.5/esri-leaflet-geocoder.js"></script>
-<link rel="stylesheet" type="text/css" href="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet-geocoder/0.0.1-beta.5/esri-leaflet-geocoder.css">
+<script src="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet-geocoder/0.0.1-beta.6/esri-leaflet-geocoder.js"></script>
+<link rel="stylesheet" type="text/css" href="http://cdn-geoweb.s3.amazonaws.com/esri-leaflet-geocoder/0.0.1-beta.6/esri-leaflet-geocoder.css">
 ```
 
 # Builds
@@ -55,8 +55,8 @@ A summary of what features exist in which builds.
 
 | Feature                                | Standard | Core     | MapService | ImageService | FeatureLayer | Basemaps | ClusteredFeatureLayer | HeatmapFeatureLayer |
 | -------------------------------------- | -------- | -------- | ---------- | ------------ | ------------ | -------- | --------------------- | ------------------- |
-| Size                                   | 41.8kb   | 7.7kb    | 20.1kb     | 17.5kb       | 23.3kb       | 8.9kb    | 3.4kb                 | 1.5kb               |
-| Gzipped                                | 6.9kb    | 1.6kb    | 3.5kb      | 3.2kb        | 4.3kb        | 1.6kb    | 0.6kb                 | 0.3kb               |
+| Size                                   | 46.8kb   | 7.7kb    | 20.1kb     | 17.5kb       | 23.3kb       | 8.9kb    | 3.4kb                 | 1.5kb               |
+| Gzipped                                | 7.3kb    | 1.6kb    | 3.5kb      | 3.2kb        | 4.3kb        | 1.6kb    | 0.6kb                 | 0.3kb               |
 | `L.esri.Request`                       | &#10003; | &#10003; | &#10003;   | &#10003;     | &#10003;     | &#10003; |                       |                     |
 | `L.esri.Util`                          | &#10003; | &#10003; | &#10003;   | &#10003;     | &#10003;     |          |                       |                     |
 | `L.esri.Services.Service`              | &#10003; | &#10003; | &#10003;   | &#10003;     | &#10003;     |          |                       |                     |