diff --git a/index.js b/index.js
index bdcc63c..713ca12 100644
--- a/index.js
+++ b/index.js
@@ -1,39 +1,38 @@
-var application = require('application');
-var platform = require('platform');
+import { Application, isAndroid } from '@nativescript/core';
 
-var exports = {};
+let showDoorbellFeedback;
 
-if (platform.isAndroid) {
-  exports.showDoorbellFeedback = function(appId, appKey, properties = null) {
+if (isAndroid) {
+  showDoorbellFeedback = function (appId, appKey, viewController, properties = undefined) {
     const feedback = new io.doorbell.android.Doorbell(
-      application.android.startActivity,
+      Application.android.startActivity,
       parseInt(appId),
       appKey
     );
     if (properties) {
-      for (var p in properties) {
+      for (let p in properties) {
         feedback.addProperty(p, properties[p]);
       }
     }
-    feedback.show();
+    return feedback.show();
   };
 } else {
-  exports.showDoorbellFeedback = function(
+  showDoorbellFeedback = function (
     appId,
     appKey,
     viewController,
-    properties = null,
+    properties = undefined,
     animated = true
   ) {
     const feedback = Doorbell.alloc().initWithApiKeyAppId(appKey, appId);
     feedback.animated = animated;
     if (properties) {
-      for (var p in properties) {
+      for (let p in properties) {
         feedback.addPropertyWithNameAndValue(p, properties[p]);
       }
     }
     if (viewController) {
-      feedback.showFeedbackDialogInViewControllerCompletion(viewController, error => {
+      feedback.showFeedbackDialogInViewControllerCompletion(viewController, (error) => {
         if (error) {
           throw error;
         }
@@ -42,4 +41,4 @@ if (platform.isAndroid) {
   };
 }
 
-module.exports = exports;
+export { showDoorbellFeedback };
diff --git a/package.json b/package.json
index d03d088..5f480e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-doorbell.io",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "homepage": "https://github.com/codeparticle/nativescript-doorbell.io",
   "nativescript": {
     "platforms": {
diff --git a/platforms/android/include.gradle b/platforms/android/include.gradle
index c230c85..82e1db3 100644
--- a/platforms/android/include.gradle
+++ b/platforms/android/include.gradle
@@ -4,5 +4,5 @@ repositories {
 }
 
 dependencies {
-	compile "io.doorbell:android-sdk:0.3.0@aar"
+	implementation "io.doorbell:android-sdk:0.3.0@aar"
 }
\ No newline at end of file