diff --git a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java b/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java
index 2073a4f22..2a56eafad 100644
--- a/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java
+++ b/android/bootstrap/src/io/appium/android/bootstrap/AndroidElementClassMap.java
@@ -57,15 +57,87 @@ public class AndroidElementClassMap {
   public AndroidElementClassMap() {
     map = new HashMap<String, String>();
     unallowed = new ArrayList<String>();
-    map.put("text", "TextView");
-    map.put("list", "ListView");
-    map.put("window", "FrameLayout");
-    map.put("grid", "GridView");
-    map.put("relative", "RelativeLayout");
+    map.put("abslist", "AbsListView");
+    map.put("absseek", "AbsSeekBar");
+    map.put("absspinner", "AbsSpinner");
+    map.put("absolute", "AbsoluteLayout");
+    map.put("adapterviewanimator", "AdapterViewAnimator");
+    map.put("adapterviewflipper", "AdapterViewFlipper");
+    map.put("analogclock", "AnalogClock");
+    map.put("appwidgethost", "AppWidgetHostView");
+    map.put("autocomplete", "AutoCompleteTextView");
+    map.put("button", "Button");
+    map.put("breadcrumbs", "FragmentBreadCrumbs");
+    map.put("calendar", "CalendarView");
+    map.put("checkbox", "CheckBox");
+    map.put("checked", "CheckedTextView");
+    map.put("chronometer", "Chronometer");
+    map.put("compound", "CompoundButton");
+    map.put("datepicker", "DatePicker");
+    map.put("dialerfilter", "DialerFilter");
+    map.put("digitalclock", "DigitalClock");
+    map.put("drawer", "SlidingDrawer");
+    map.put("expandable", "ExpandableListView");
+    map.put("extract", "ExtractEditText");
+    map.put("fragmenttabhost", "FragmentTabHost");
     map.put("frame", "FrameLayout");
+    map.put("gallery", "Gallery");
+    map.put("gesture", "GestureOverlayView");
+    map.put("glsurface", "GLSurfaceView");
+    map.put("grid", "GridView");
+    map.put("gridlayout", "GridLayout");
+    map.put("horizontal", "HorizontalScrollView");
+    map.put("image", "ImageView");
+    map.put("imagebutton", "ImageButton");
+    map.put("imageswitcher", "ImageSwitcher");
+    map.put("keyboard", "KeyboardView");
     map.put("linear", "LinearLayout");
-    map.put("textfield", "EditText");
+    map.put("list", "ListView");
+    map.put("media", "MediaController");
+    map.put("mediaroutebutton", "MediaRouteButton");
+    map.put("multiautocomplete", "MultiAutoCompleteTextView");
+    map.put("numberpicker", "NumberPicker");
+    map.put("pagetabstrip", "PageTabStrip");
+    map.put("pagetitlestrip", "PageTitleStrip");
+    map.put("progress", "ProgressBar");
+    map.put("quickcontactbadge", "QuickContactBadge");
+    map.put("radio", "RadioButton");
+    map.put("radiogroup", "RadioGroup");
+    map.put("rating", "RatingBar");
+    map.put("relative", "RelativeLayout");
+    map.put("row", "TableRow");
+    map.put("rssurface", "RSSurfaceView");
+    map.put("rstexture", "RSTextureView");
     map.put("scroll", "ScrollView");
+    map.put("search", "SearchView");
+    map.put("seek", "SeekBar");
+    map.put("space", "Space");
+    map.put("spinner", "Spinner");
+    map.put("stack", "StackView");
+    map.put("surface", "SurfaceView");
+    map.put("switch", "Switch");
+    map.put("tabhost", "TabHost");
+    map.put("tabwidget", "TabWidget");
+    map.put("table", "TableLayout");
+    map.put("text", "TextView");
+    map.put("textclock", "TextClock");
+    map.put("textswitcher", "TextSwitcher");
+    map.put("texture", "TextureView");
+    map.put("textfield", "EditText");
+    map.put("timepicker", "TimePicker");
+    map.put("toggle", "ToggleButton");
+    map.put("twolinelistitem", "TwoLineListItem");
+    map.put("video", "VideoView");
+    map.put("viewanimator", "ViewAnimator");
+    map.put("viewflipper", "ViewFlipper");
+    map.put("viewgroup", "ViewGroup");
+    map.put("viewpager", "ViewPager");
+    map.put("viewstub", "ViewStub");
+    map.put("viewswitcher", "ViewSwitcher");
+    map.put("web", "WebView");
+    map.put("window", "FrameLayout");
+    map.put("zoom", "ZoomButton");
+    map.put("zoomcontrols", "ZoomControls");
 
     unallowed.add("secure");
   }