diff --git a/Android/DatePicker/DatePickerPlugin.java b/Android/DatePicker/DatePickerPlugin.java
index 643eafe..f032c15 100644
--- a/Android/DatePicker/DatePickerPlugin.java
+++ b/Android/DatePicker/DatePickerPlugin.java
@@ -14,6 +14,7 @@ import android.app.DatePickerDialog;
 import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.TimePickerDialog;
 import android.app.TimePickerDialog.OnTimeSetListener;
+import android.content.Context;
 import android.util.Log;
 import android.widget.DatePicker;
 import android.widget.TimePicker;
diff --git a/Android/DatePicker/datePickerPlugin.js b/Android/DatePicker/datePickerPlugin.js
index 9f533f7..ce2632e 100644
--- a/Android/DatePicker/datePickerPlugin.js
+++ b/Android/DatePicker/datePickerPlugin.js
@@ -2,7 +2,7 @@
  * Phonegap DatePicker Plugin Copyright (c) Greg Allen 2011 MIT Licensed
  * Reused and ported to Android plugin by Daniel van 't Oever
  */
-if (typeof cordova !== "undefined") {
+var DatePicker = (function (gap) {
 	/**
 	 * Constructor
 	 */
@@ -30,7 +30,7 @@ if (typeof cordova !== "undefined") {
 		}
 		this._callback = cb;
 
-		return cordova.exec(cb, failureCallback, 'DatePickerPlugin', defaults.mode, new Array(defaults));
+		return gap.exec(cb, failureCallback, 'DatePickerPlugin', defaults.mode, new Array(defaults));
 	};
 
 	DatePicker.prototype._dateSelected = function(date) {
@@ -43,10 +43,22 @@ if (typeof cordova !== "undefined") {
 		console.log("datePickerPlugin.js failed: " + err);
 	}
 
-	cordova.addConstructor(function() {
-		if (!window.plugins) {
-			window.plugins = {};
-		}
-		window.plugins.datePicker = new DatePicker();
-	});
-};
+	/**
+     * Load DatePicker
+     */
+    gap.addConstructor(function () {
+        if (gap.addPlugin) {
+            gap.addPlugin("datePicker", DatePicker);
+        } else {
+            if (!window.plugins) {
+                window.plugins = {};
+            }
+
+            window.plugins.datePicker = new DatePicker();
+        }
+    });
+	
+	return DatePicker;
+	
+	
+})(window.cordova || window.Cordova || window.PhoneGap);