diff --git a/example/android/myapplication/build.gradle b/example/android/myapplication/build.gradle
index e18eb02594a528913e227389d1eef1f907c60a27..91b6539c6936ff1eaffebc66ca5e235718a2c038 100644
--- a/example/android/myapplication/build.gradle
+++ b/example/android/myapplication/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "24.0.1"
 
     defaultConfig {
-        applicationId "com.wix.reactnativenotifications"
+        applicationId "com.wix.reactnativenotifications.app"
         minSdkVersion 16
         targetSdkVersion 23
         versionCode 1
diff --git a/example/android/myapplication/proguard-rules.pro b/example/android/myapplication/proguard-rules.pro
index d6036156526227c05fb4de73698aa38e45e7602e..57dcf0f7c50e676d70b08177e13e257a85a20017 100644
--- a/example/android/myapplication/proguard-rules.pro
+++ b/example/android/myapplication/proguard-rules.pro
@@ -15,3 +15,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
+-keep class * extends com.facebook.react.bridge.NativeModule { *; }
diff --git a/example/android/myapplication/src/main/AndroidManifest.xml b/example/android/myapplication/src/main/AndroidManifest.xml
index ec5c0596eed21738aaca89682fb8d300f95bcf26..214751cac600ef8a87168b9eaf0496b3bf2c52e6 100644
--- a/example/android/myapplication/src/main/AndroidManifest.xml
+++ b/example/android/myapplication/src/main/AndroidManifest.xml
@@ -3,27 +3,33 @@
           package="com.wix.reactnativenotifications.app">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
+        android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
-
-        <meta-data android:name="com.wix.reactnativenotifications.gcmSenderId" android:value="434691868895\0"/>
+        <meta-data
+            android:name="com.wix.reactnativenotifications.gcmSenderId"
+            android:value="434691868895\0"/>
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ChildActivity"
+            android:label="Child Activity">
+            <meta-data android:name="android.support.PARENT_ACTIVITY" android:value="com.wix.reactnativenotifications.app.MainActivity"/>
+        </activity>
 
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..645bb3b51d8deebaf6f05ed59b5877d80c331d13
--- /dev/null
+++ b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/ChildActivity.java
@@ -0,0 +1,20 @@
+package com.wix.reactnativenotifications.app;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+public class ChildActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_child);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+}
diff --git a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java
index 67e3b242a1a2849525223b994077f26d5df4f568..ace73012cd86d1b134c8a7dff4e558df00ab3551 100644
--- a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java
+++ b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainActivity.java
@@ -1,46 +1,39 @@
 package com.wix.reactnativenotifications.app;
 
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.widget.Toolbar;
 
-import com.facebook.react.LifecycleState;
-import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.facebook.react.shell.MainReactPackage;
-import com.wix.reactnativenotifications.RNNotificationsPackage;
 
 import static android.os.Build.VERSION.SDK_INT;
 
-public class MainActivity extends Activity implements DefaultHardwareBackBtnHandler {
+public class MainActivity extends ReactActivity {
 
     private static final int OVERLAY_PERMISSION_REQ_CODE = 1234;
 
     private ReactRootView mReactRootView;
-    private ReactInstanceManager mReactInstanceManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        ViewGroup layout = (ViewGroup) getLayoutInflater().inflate(R.layout.activity_main, null);
+        Toolbar toolbar = (Toolbar) layout.findViewById(R.id.toolbar);
+        setActionBar(toolbar);
+
         mReactRootView = new ReactRootView(this);
-        mReactInstanceManager = ReactInstanceManager.builder()
-            .setApplication(getApplication())
-            .setBundleAssetName("index.android.bundle")
-            .setJSMainModuleName("index.android")
-            .addPackage(new MainReactPackage())
-            .addPackage(new RNNotificationsPackage())
-            .setUseDeveloperSupport(BuildConfig.DEBUG)
-            .setInitialLifecycleState(LifecycleState.RESUMED)
-            .build();
+        layout.addView(mReactRootView);
+
+        setContentView(layout);
 
         if (SDK_INT >= Build.VERSION_CODES.M && !Settings.canDrawOverlays(this)) {
             Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + getPackageName()));
@@ -50,9 +43,22 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        menu.add("Child Activity").setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                Intent intent = new Intent(MainActivity.this, ChildActivity.class);
+                MainActivity.this.startActivity(intent);
+                return true;
+            }
+        });
+        return super.onCreateOptionsMenu(menu);
+    }
+
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == OVERLAY_PERMISSION_REQ_CODE) {
             if (Settings.canDrawOverlays(this)) {
                 startReactApplication();
@@ -62,40 +68,7 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        if (mReactInstanceManager != null) {
-            mReactInstanceManager.onHostResume(this, this);
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        if (mReactInstanceManager != null) {
-            mReactInstanceManager.onHostPause(this);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        if (mReactInstanceManager != null) {
-            mReactInstanceManager.onHostDestroy(this);
-        }
-    }
-
-    @Override
-    public void invokeDefaultOnBackPressed() {
-        super.onBackPressed();
-    }
-
     private void startReactApplication() {
-        mReactRootView.startReactApplication(mReactInstanceManager, "WixRNNotifications", null);
-        setContentView(mReactRootView);
+        mReactRootView.startReactApplication(getReactInstanceManager(), "WixRNNotifications", null);
     }
 }
diff --git a/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainApplication.java b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainApplication.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc8df0061a891a76553af18232eb096c75287283
--- /dev/null
+++ b/example/android/myapplication/src/main/java/com/wix/reactnativenotifications/app/MainApplication.java
@@ -0,0 +1,35 @@
+package com.wix.reactnativenotifications.app;
+
+import android.app.Application;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.shell.MainReactPackage;
+import com.wix.reactnativenotifications.RNNotificationsPackage;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class MainApplication extends Application implements ReactApplication {
+
+    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+        @Override
+        protected boolean getUseDeveloperSupport() {
+            return BuildConfig.DEBUG;
+        }
+
+        @Override
+        protected List<ReactPackage> getPackages() {
+            return Arrays.asList(
+                    new MainReactPackage(),
+                    new RNNotificationsPackage()
+                );
+        }
+    };
+
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        return mReactNativeHost;
+    }
+}
diff --git a/example/android/myapplication/src/main/res/layout/activity_child.xml b/example/android/myapplication/src/main/res/layout/activity_child.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a95e8a24f6e28bafe7283a7a1fb550f81d957d2e
--- /dev/null
+++ b/example/android/myapplication/src/main/res/layout/activity_child.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_child"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.wix.reactnativenotifications.app.ChildActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="By default, when opening a notification, the entire activity back-stack will be restored as-is!\n(instead of launching or relaunching the main activity)"
+        android:layout_centerInParent="true"
+        />
+
+</RelativeLayout>
diff --git a/example/android/myapplication/src/main/res/layout/activity_main.xml b/example/android/myapplication/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000000000000000000000000000000000000..349ccb5bbd86ccfcdcf96d4f058ef7191f2c3506
--- /dev/null
+++ b/example/android/myapplication/src/main/res/layout/activity_main.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.wix.reactnativenotifications.app.MainActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+        <android.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+    </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/example/android/myapplication/src/main/res/values-w820dp/dimens.xml b/example/android/myapplication/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..63fc816444614bd64f68a372d1f93211628ee51d
--- /dev/null
+++ b/example/android/myapplication/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/example/android/myapplication/src/main/res/values/dimens.xml b/example/android/myapplication/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47c82246738c4d056e8030d3a259206f42e8e15d
--- /dev/null
+++ b/example/android/myapplication/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/example/android/myapplication/src/main/res/values/strings.xml b/example/android/myapplication/src/main/res/values/strings.xml
index 3e65fa4b196eb480c0f395dc5b82c1403f678313..7fd259ad36551bda78f6d050440b24b80ec55231 100644
--- a/example/android/myapplication/src/main/res/values/strings.xml
+++ b/example/android/myapplication/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
 <resources>
     <string name="app_name">Wix RN Notifications</string>
-    <string name="action_settings">Settings</string>
 </resources>
diff --git a/example/android/myapplication/src/main/res/values/styles.xml b/example/android/myapplication/src/main/res/values/styles.xml
index fa3d07cf513f51cb02978113f688f75de5360a26..16dbab30f23fdd6b78a2bdff5c6bf2f9c76efe95 100644
--- a/example/android/myapplication/src/main/res/values/styles.xml
+++ b/example/android/myapplication/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/example/android/reactnativenotification/src/main/AndroidManifest.xml b/example/android/reactnativenotification/src/main/AndroidManifest.xml
index 4ff38f48d9f696bff216809a5f201586e62005a5..edc0c2d5ffea4afde8d94dca9f8b5de8a292c287 100644
--- a/example/android/reactnativenotification/src/main/AndroidManifest.xml
+++ b/example/android/reactnativenotification/src/main/AndroidManifest.xml
@@ -10,10 +10,16 @@
         android:name="${applicationId}.permission.C2D_MESSAGE"
         android:protectionLevel="signature" />
     <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
     <application>
 
+        <!--
+         A proxy-activity that either launches the main activity or resumes the currently running app.
+         Required in order to keep the initial intent so it could be retrieved by the JS client.
+         Note: we declare it in its own private affinity so that a running app stack wouldn't shadow its creation.
+         -->
+        <activity android:name=".core.ProxyActivity" android:taskAffinity="com.wix.reactnativenotifications.core.ProxyActivity"/>
+
         <!--
          Google's ready-to-use GcmReceiver.
          1. Awaits actual GCM messages (e.g. push notifications) and invokes the GCM service with the concrete content.
@@ -31,7 +37,7 @@
         </receiver>
         <!-- Dispatched by the GcmReceiver when messages are received. -->
         <service
-            android:name="com.wix.reactnativenotifications.GcmMessageHandlerService"
+            android:name="com.wix.reactnativenotifications.gcm.GcmMessageHandlerService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
@@ -39,14 +45,14 @@
         </service>
         <!-- Dispatched by the GcmReceiver. Starts the designated refresh-handling service. -->
         <service
-            android:name="com.wix.reactnativenotifications.GcmInstanceIdListenerService"
+            android:name=".gcm.GcmInstanceIdListenerService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.android.gms.iid.InstanceID" />
             </intent-filter>
         </service>
         <service
-            android:name="com.wix.reactnativenotifications.GcmInstanceIdRefreshHandlerService"
+            android:name=".gcm.GcmInstanceIdRefreshHandlerService"
             android:exported="false" />
     </application>
 
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/Defs.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/Defs.java
index 67afeff62d1ae205439de70bf2f15d1b765853af..fff51742cb3fb8ad9c888479bdead9b70d063558 100644
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/Defs.java
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/Defs.java
@@ -1,8 +1,11 @@
 package com.wix.reactnativenotifications;
 
-/*package*/ interface Defs {
+public interface Defs {
     String LOGTAG = "ReactNativeNotifs";
     String GCM_SENDER_ID_ATTR_NAME = "com.wix.reactnativenotifications.gcmSenderId";
 
     String TOKEN_RECEIVED_EVENT_NAME = "remoteNotificationsRegistered";
+
+    String NOTIFICATION_RECEIVED_EVENT_NAME = "notificationReceived";
+    String NOTIFICATION_OPENED_EVENT_NAME = "notificationOpened";
 }
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmMessageHandlerService.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmMessageHandlerService.java
deleted file mode 100644
index 3f91da2bffff951d18ea4750d9bc73402d833deb..0000000000000000000000000000000000000000
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmMessageHandlerService.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.wix.reactnativenotifications;
-
-import android.app.Activity;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.google.android.gms.gcm.GcmListenerService;
-
-import static com.wix.reactnativenotifications.Defs.LOGTAG;
-
-public class GcmMessageHandlerService extends GcmListenerService {
-
-    @Override
-    public void onMessageReceived(String s, Bundle bundle) {
-        Log.d(LOGTAG, "New message from GCM: " + bundle);
-
-        final Bundle notificationBundle = bundle.getBundle("notification");
-        final Bundle dataBundle = bundle.getBundle("data");
-        if (notificationBundle == null) {
-            return;
-        }
-
-        final String title = notificationBundle.getString("title");
-        final String body = notificationBundle.getString("body");
-        if (title == null || title.trim().isEmpty() || body == null || body.trim().isEmpty()) {
-            return;
-        }
-
-        final PendingIntent pendingIntent = getCTAPendingIntent(notificationBundle, dataBundle);
-        final Notification notification = buildNotification(title, body, pendingIntent);
-        postNotification((int) System.currentTimeMillis(), notification);
-    }
-
-    protected PendingIntent getCTAPendingIntent(Bundle notificationBundle, Bundle dataBundle) {
-        final Context appContext = getApplicationContext();
-        final Intent helperIntent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-        final Intent intent;
-        try {
-            intent = new Intent(appContext, Class.forName(helperIntent.getComponent().getClassName()));
-            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-            intent.putExtra("notification.meta", notificationBundle);
-            intent.putExtra("notification.data", dataBundle);
-            return PendingIntent.getActivity(appContext, 0, intent, 0);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    protected Notification buildNotification(String title, String body, PendingIntent intent) {
-        final Context appContext = getApplicationContext();
-        final Notification.Builder notificationBuilder = new Notification.Builder(appContext)
-                .setContentTitle(title)
-                .setContentText(body)
-                .setSmallIcon(R.drawable.notification)
-                .setContentIntent(intent)
-                .setDefaults(Notification.DEFAULT_ALL)
-                .setAutoCancel(true);
-
-        final Notification notification = notificationBuilder.build();
-        return notification;
-    }
-
-    protected void postNotification(int id, Notification notification) {
-        final Context appContext = getApplicationContext();
-        final NotificationManager notificationManager = (NotificationManager) appContext.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(id, notification);
-    }
-
-    protected Activity getCurrentActivity() {
-        final ReactApplicationContext reactContext = RNNotificationsContextHolder.getReactContext();
-        if (reactContext == null) {
-            return null;
-        }
-        return reactContext.getCurrentActivity();
-    }
-}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsContextHolder.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsContextHolder.java
deleted file mode 100644
index f42f1f7b1852b78ca68e8ecf01ae4e90183a07ed..0000000000000000000000000000000000000000
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsContextHolder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.wix.reactnativenotifications;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-
-public class RNNotificationsContextHolder extends ReactContextBaseJavaModule {
-
-    private static RNNotificationsContextHolder sInstance;
-
-    public static RNNotificationsContextHolder createInstance(ReactApplicationContext reactContext) {
-        if (sInstance == null) {
-            sInstance = new RNNotificationsContextHolder(reactContext);
-        }
-
-        return sInstance;
-    }
-
-    public static ReactApplicationContext getReactContext() {
-        return (sInstance == null ? null : sInstance.getReactApplicationContext());
-    }
-
-    private RNNotificationsContextHolder(ReactApplicationContext reactContext) {
-        super(reactContext);
-    }
-
-    @Override
-    public String getName() {
-        return "RNNotificationsContextHolder";
-    }
-}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
index 3d43897b5faba3cf79247759eb15fd991decb1dd..215308a587277d09dad7e6e78d1c032830da4e2d 100644
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsPackage.java
@@ -5,6 +5,7 @@ import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
+import com.wix.reactnativenotifications.core.RNNotificationsModule;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,9 +15,7 @@ public class RNNotificationsPackage implements ReactPackage {
 
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(
-                    RNNotificationsContextHolder.createInstance(reactContext),
-                    new RNNotificationsModule(reactContext));
+        return Arrays.<NativeModule>asList(new RNNotificationsModule(reactContext));
     }
 
     @Override
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationStore.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationStore.java
new file mode 100644
index 0000000000000000000000000000000000000000..e7563c130b351d1fdc1c0e11638d6df073fb90e4
--- /dev/null
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/InitialNotificationStore.java
@@ -0,0 +1,13 @@
+package com.wix.reactnativenotifications.core;
+
+public class InitialNotificationStore {
+    private static PushNotificationProps sInitialNotif;
+
+    public static void setInitialNotification(PushNotificationProps pushNotificationProps) {
+        sInitialNotif = pushNotificationProps;
+    }
+
+    public static PushNotificationProps getInitialNotification() {
+        return sInitialNotif;
+    }
+}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
new file mode 100644
index 0000000000000000000000000000000000000000..2bdd9924f7e5c2511618511b1e64c539ab64a044
--- /dev/null
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/NotificationIntentAdapter.java
@@ -0,0 +1,20 @@
+package com.wix.reactnativenotifications.core;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class NotificationIntentAdapter {
+    private static final int PENDING_INTENT_CODE = 0;
+    private static final String PUSH_NOTIFICATION_EXTRA_NAME = "pushNotification";
+
+    public static PendingIntent createPendingNotificationIntent(Context appContext, Intent intent, PushNotificationProps notification) {
+        intent.putExtra(PUSH_NOTIFICATION_EXTRA_NAME, notification.asBundle());
+        return PendingIntent.getActivity(appContext, PENDING_INTENT_CODE, intent, 0);
+    }
+
+    public static Bundle extractPendingNotificationDataFromIntent(Intent intent) {
+        return intent.getBundleExtra(PUSH_NOTIFICATION_EXTRA_NAME);
+    }
+}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/ProxyActivity.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/ProxyActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..bbeaac9bf2c0c9ecf8d6ab562cfc084b69f0327c
--- /dev/null
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/ProxyActivity.java
@@ -0,0 +1,28 @@
+package com.wix.reactnativenotifications.core;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+import static com.wix.reactnativenotifications.Defs.LOGTAG;
+
+/**
+ * The front-end (hidden) activity for handling notification <b>opening</b> actions triggered by the
+ * device user (i.e. upon tapping on them in the notifications drawer).
+ */
+public class ProxyActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Log.d(LOGTAG, "ProxyActivity.onCreate, " + getIntent().getExtras());
+
+        final Bundle rawNotificationData = NotificationIntentAdapter.extractPendingNotificationDataFromIntent(getIntent());
+        if (rawNotificationData != null) {
+            new PushNotification(this, rawNotificationData).onOpened(this);
+        }
+
+        finish();
+    }
+}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotification.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotification.java
new file mode 100644
index 0000000000000000000000000000000000000000..29e31dd2d279c0c4bed26025913693668791fe48
--- /dev/null
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotification.java
@@ -0,0 +1,150 @@
+package com.wix.reactnativenotifications.core;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import static com.wix.reactnativenotifications.Defs.LOGTAG;
+import static com.wix.reactnativenotifications.Defs.NOTIFICATION_OPENED_EVENT_NAME;
+import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
+
+public class PushNotification {
+
+    public static class InvalidNotificationException extends Exception {
+        public InvalidNotificationException(String detailMessage) {
+            super(detailMessage);
+        }
+    }
+
+    private final Context mAppContext;
+    private PushNotificationProps mNotificationProps;
+
+    public PushNotification(Context context, Bundle bundle) {
+        mAppContext = context.getApplicationContext();
+        mNotificationProps = new PushNotificationProps(bundle);
+    }
+
+    public void onReceived() throws InvalidNotificationException {
+        postNotification();
+        notifyReceivedToJS();
+    }
+
+    public void onOpened(Activity hostActivity) {
+        digestNotification(hostActivity);
+    }
+
+    public PushNotificationProps asProps() {
+        return mNotificationProps.copy();
+    }
+
+    protected void postNotification() {
+        final PendingIntent pendingIntent = getCTAPendingIntent();
+        final Notification notification = buildNotification(pendingIntent);
+        postNotification((int) System.currentTimeMillis(), notification);
+    }
+
+    protected void digestNotification(Activity activity) {
+        final ReactContext reactContext = getRunningReactContext();
+        if (reactContext != null) {
+            launchOrResumeApp(activity);
+            notifyOpenedToJS(reactContext);
+        } else {
+            InitialNotificationStore.setInitialNotification(mNotificationProps);
+            launchOrResumeApp(activity);
+        }
+    }
+
+    protected PendingIntent getCTAPendingIntent() {
+        // Note: we launch the proxy activity, assuming it'll take it from there.
+        final Intent cta = new Intent(mAppContext, ProxyActivity.class);
+        return NotificationIntentAdapter.createPendingNotificationIntent(mAppContext, cta, mNotificationProps);
+    }
+
+    protected Notification buildNotification(PendingIntent intent) {
+        final Notification.Builder notificationBuilder = new Notification.Builder(mAppContext)
+                .setContentTitle(mNotificationProps.getTitle())
+                .setContentText(mNotificationProps.getBody())
+                .setSmallIcon(mAppContext.getApplicationInfo().icon)
+                .setContentIntent(intent)
+                .setDefaults(Notification.DEFAULT_ALL)
+                .setAutoCancel(true);
+
+        return notificationBuilder.build();
+    }
+
+    protected void postNotification(int id, Notification notification) {
+        final NotificationManager notificationManager = (NotificationManager) mAppContext.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(id, notification);
+    }
+
+    protected ReactContext getRunningReactContext() {
+        final ReactNativeHost rnHost = ((ReactApplication) mAppContext).getReactNativeHost();
+        if (!rnHost.hasInstance()) {
+            return null;
+        }
+
+        final ReactInstanceManager instanceManager = ((ReactApplication) mAppContext).getReactNativeHost().getReactInstanceManager();
+        final ReactContext reactContext = instanceManager.getCurrentReactContext();
+        if (reactContext == null || !reactContext.hasActiveCatalystInstance()) {
+            return null;
+        }
+
+        return reactContext;
+    }
+
+    private void notifyReceivedToJS() {
+        notifyJS(NOTIFICATION_RECEIVED_EVENT_NAME, null);
+    }
+
+    private void notifyOpenedToJS() {
+        notifyOpenedToJS(null);
+    }
+
+    private void notifyOpenedToJS(ReactContext reactContext) {
+        notifyJS(NOTIFICATION_OPENED_EVENT_NAME, reactContext);
+    }
+
+    private void notifyJS(String eventName, ReactContext reactContext) {
+        if (reactContext == null) {
+            reactContext = getRunningReactContext();
+        }
+
+        if (reactContext != null) {
+            final WritableMap notificationAsMap = Arguments.fromBundle(mNotificationProps.asBundle());
+            reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(eventName, notificationAsMap);
+        }
+    }
+
+    protected void launchOrResumeApp(Activity activity) {
+        // The desired behavior upon notification opening is as follows:
+        // - If app is in foreground (and possibly has several activities in stack), simply keep it as-is in foreground.
+        // - If app is in background, bring it to foreground as-is (activity stack untampered).
+        //   A distinction is made in this case such that if app went to back due to *back-button*, is should be recreated.
+        // - If app is dead, launch it through the main activity (as Android launchers do).
+        // THIS IS EXACTLY THE SAME AS ANDROID LAUNCHERS WORK. So, we use the same configuration (action, categories and
+        // flags) as they do.
+        final Intent helperIntent = mAppContext.getPackageManager().getLaunchIntentForPackage(mAppContext.getPackageName());
+        try {
+            final Intent intent = Intent.makeMainActivity(new ComponentName(mAppContext, Class.forName(helperIntent.getComponent().getClassName())));
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
+            activity.startActivity(intent);
+        } catch (ClassNotFoundException e) {
+            Log.e(LOGTAG, "Failed to launch/resume app", e);
+        }
+    }
+
+}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotificationProps.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotificationProps.java
new file mode 100644
index 0000000000000000000000000000000000000000..33936b04eace093f5489b975bd7a2d253961a992
--- /dev/null
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/PushNotificationProps.java
@@ -0,0 +1,46 @@
+package com.wix.reactnativenotifications.core;
+
+import android.os.Bundle;
+
+/**
+ * @author amitd
+ */
+public class PushNotificationProps {
+
+    private Bundle mBundle;
+
+    public PushNotificationProps(Bundle bundle) {
+        final String title = bundle.getString("title");
+        final String body = bundle.getString("body");
+        if (title == null || title.trim().isEmpty() || body == null || body.trim().isEmpty()) {
+            throw new IllegalArgumentException("Invalid notification");
+        }
+
+        mBundle = bundle;
+    }
+
+    public String getTitle() {
+        return mBundle.getString("title");
+    }
+
+    public String getBody() {
+        return mBundle.getString("body");
+    }
+
+    public Bundle asBundle() {
+        return (Bundle) mBundle.clone();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder(1024);
+        for (String key : mBundle.keySet()) {
+            sb.append(key).append("=").append(mBundle.get(key)).append(", ");
+        }
+        return sb.toString();
+    }
+
+    protected PushNotificationProps copy() {
+        return new PushNotificationProps((Bundle) mBundle.clone());
+    }
+}
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/RNNotificationsModule.java
similarity index 53%
rename from example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
rename to example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/RNNotificationsModule.java
index 383b388004abac17807b9d7dc6aa187c83b54340..35578a3d009cbad12f14ca54a295f0b81a08c827 100644
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/RNNotificationsModule.java
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/core/RNNotificationsModule.java
@@ -1,17 +1,19 @@
-package com.wix.reactnativenotifications;
+package com.wix.reactnativenotifications.core;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.facebook.react.bridge.ActivityEventListener;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.wix.reactnativenotifications.gcm.GcmInstanceIdRefreshHandlerService;
 
 import static com.wix.reactnativenotifications.Defs.LOGTAG;
 
-public class RNNotificationsModule extends ReactContextBaseJavaModule implements ActivityEventListener {
+public class RNNotificationsModule extends ReactContextBaseJavaModule {
 
     public RNNotificationsModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -19,7 +21,7 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule implements
 
     @Override
     public String getName() {
-        return "WixRNNotification";
+        return "WixRNNotifications";
     }
 
     @Override
@@ -28,16 +30,21 @@ public class RNNotificationsModule extends ReactContextBaseJavaModule implements
         final Context appContext = getReactApplicationContext().getApplicationContext();
         final Intent tokenFetchIntent = new Intent(appContext, GcmInstanceIdRefreshHandlerService.class);
         appContext.startService(tokenFetchIntent);
-
-        getReactApplicationContext().addActivityEventListener(this);
     }
 
-    @Override
-    public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
-    }
+    @ReactMethod
+    public void getInitialNotification(final Promise promise) {
+        Object result = null;
 
-    @Override
-    public void onNewIntent(Intent intent) {
-        Log.e(LOGTAG, "New intent: "+intent);
+        try {
+            final PushNotificationProps notification = InitialNotificationStore.getInitialNotification();
+            if (notification == null) {
+                return;
+            }
+
+            result = Arguments.fromBundle(notification.asBundle());
+        } finally {
+            promise.resolve(result);
+        }
     }
 }
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmInstanceIdListenerService.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmInstanceIdListenerService.java
similarity index 93%
rename from example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmInstanceIdListenerService.java
rename to example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmInstanceIdListenerService.java
index b0fc5b9788139a30c73d6e6708b8afa0f4c37aad..933415f5cdc3b96b055c2a5e1c76208e914dc9b6 100644
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmInstanceIdListenerService.java
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmInstanceIdListenerService.java
@@ -1,4 +1,4 @@
-package com.wix.reactnativenotifications;
+package com.wix.reactnativenotifications.gcm;
 
 import android.content.Intent;
 
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmInstanceIdRefreshHandlerService.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmInstanceIdRefreshHandlerService.java
similarity index 85%
rename from example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmInstanceIdRefreshHandlerService.java
rename to example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmInstanceIdRefreshHandlerService.java
index 72120c162d1fa9433ef2e74089800afce7b761bc..887f3b08d5ec29dbbb72883bfa85dc54e40d9357 100644
--- a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/GcmInstanceIdRefreshHandlerService.java
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmInstanceIdRefreshHandlerService.java
@@ -1,4 +1,4 @@
-package com.wix.reactnativenotifications;
+package com.wix.reactnativenotifications.gcm;
 
 import android.app.IntentService;
 import android.content.Intent;
@@ -6,7 +6,9 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.util.Log;
 
-import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.google.android.gms.gcm.GoogleCloudMessaging;
 import com.google.android.gms.iid.InstanceID;
@@ -66,10 +68,11 @@ public class GcmInstanceIdRefreshHandlerService extends IntentService {
     }
 
     protected void notifyTokenEvent(String registrationToken) {
-        final ReactApplicationContext reactContext = RNNotificationsContextHolder.getReactContext();
+        final ReactInstanceManager instanceManager = ((ReactApplication) getApplication()).getReactNativeHost().getReactInstanceManager();
+        final ReactContext reactContext = instanceManager.getCurrentReactContext();
 
         // Note: Cannot assume react-context exists cause this is an async dispatched service.
-        if (reactContext != null) {
+        if (reactContext != null && reactContext.hasActiveCatalystInstance()) {
             reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit(TOKEN_RECEIVED_EVENT_NAME, registrationToken);
         }
     }
diff --git a/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmMessageHandlerService.java b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmMessageHandlerService.java
new file mode 100644
index 0000000000000000000000000000000000000000..290feeb438890b361356f2617317dcaa48e72ff3
--- /dev/null
+++ b/example/android/reactnativenotification/src/main/java/com/wix/reactnativenotifications/gcm/GcmMessageHandlerService.java
@@ -0,0 +1,25 @@
+package com.wix.reactnativenotifications.gcm;
+
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.android.gms.gcm.GcmListenerService;
+import com.wix.reactnativenotifications.core.PushNotification;
+
+import static com.wix.reactnativenotifications.Defs.LOGTAG;
+
+public class GcmMessageHandlerService extends GcmListenerService {
+
+    @Override
+    public void onMessageReceived(String s, Bundle bundle) {
+        Log.d(LOGTAG, "New message from GCM: " + bundle);
+
+        try {
+            final PushNotification notification = new PushNotification(getApplicationContext(), bundle);
+            notification.onReceived();
+        } catch (PushNotification.InvalidNotificationException e) {
+            // A GCM message, yes - but not the kind we know how to work with.
+            Log.v(LOGTAG, "GCM message handling aborted", e);
+        }
+    }
+}
diff --git a/example/android/reactnativenotification/src/main/res/drawable-hdpi/notification.png b/example/android/reactnativenotification/src/main/res/drawable-hdpi/notification.png
deleted file mode 100644
index cde69bcccec65160d92116f20ffce4fce0b5245c..0000000000000000000000000000000000000000
Binary files a/example/android/reactnativenotification/src/main/res/drawable-hdpi/notification.png and /dev/null differ
diff --git a/example/android/reactnativenotification/src/main/res/drawable-mdpi/notification.png b/example/android/reactnativenotification/src/main/res/drawable-mdpi/notification.png
deleted file mode 100644
index c133a0cbd379f5af6dbf1a899a0293ca5eccfad0..0000000000000000000000000000000000000000
Binary files a/example/android/reactnativenotification/src/main/res/drawable-mdpi/notification.png and /dev/null differ
diff --git a/example/android/reactnativenotification/src/main/res/drawable-xhdpi/notification.png b/example/android/reactnativenotification/src/main/res/drawable-xhdpi/notification.png
deleted file mode 100644
index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..0000000000000000000000000000000000000000
Binary files a/example/android/reactnativenotification/src/main/res/drawable-xhdpi/notification.png and /dev/null differ
diff --git a/example/android/reactnativenotification/src/main/res/drawable-xxhdpi/notification.png b/example/android/reactnativenotification/src/main/res/drawable-xxhdpi/notification.png
deleted file mode 100644
index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..0000000000000000000000000000000000000000
Binary files a/example/android/reactnativenotification/src/main/res/drawable-xxhdpi/notification.png and /dev/null differ
diff --git a/example/android/reactnativenotification/src/main/res/drawable-xxxhdpi/notification.png b/example/android/reactnativenotification/src/main/res/drawable-xxxhdpi/notification.png
deleted file mode 100644
index aee44e138434630332d88b1680f33c4b24c70ab3..0000000000000000000000000000000000000000
Binary files a/example/android/reactnativenotification/src/main/res/drawable-xxxhdpi/notification.png and /dev/null differ
diff --git a/example/android/reactnativenotification/src/main/res/values/strings.xml b/example/android/reactnativenotification/src/main/res/values/strings.xml
deleted file mode 100644
index d8b1ac9710e448cb1691389821d5106fa044176d..0000000000000000000000000000000000000000
--- a/example/android/reactnativenotification/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">lib</string>
-</resources>
diff --git a/example/android/send_notif.py b/example/android/send_notif.py
index 543fc1f5a0a59ba0b2cb293de29429a48bdd426b..11e1ead2acd8d689b28c56ffe3f13fbc3459e7ec 100644
--- a/example/android/send_notif.py
+++ b/example/android/send_notif.py
@@ -4,11 +4,11 @@ import json
 import sys
 
 API_KEY = "AIzaSyBVtqdO_SgPVhhXnyNGC_VXSbIX-fxk1YY"
-TOKEN = "eB6llQJLpw0:APA91bG3t07UNFyz_NPmGjgTZ8-tAUzwKmBJctKm2qpw973c-3vEINtTC3nVl89uJNv-l2LHzfd7fSmVPjeaVAQBE8tC9Pp2X5foteVMuBlHEiB5cznXqnP5RiCroGo1DdBIdWzBMwHW"
+TOKEN = "c70LL7cNR-0:APA91bFja9qHDqLFtKYGCKNZRBcgHAQrmcPE-XNIIctnFnsEKJml9tgbuQql15ORoJc4drw6fAA38_JFx1X3s3wF9FlArPO_laPTXmaCC4_ZFm1QzfgmoJ5hXUhDFsArJpTVFIonEOHR"
 
 data={
     "to": TOKEN,
-    "notification" : {
+    "data" : {
         "body": "A very tiny one",
         "title": "A tiny notification"
     }
diff --git a/example/index.android.js b/example/index.android.js
index bd801e92ced7c6a2ee37a961fa1127dd0d4b8845..dd4f177329f5a06729fb852178ebe250695fc0b1 100644
--- a/example/index.android.js
+++ b/example/index.android.js
@@ -5,9 +5,12 @@ import {
   AppRegistry,
   StyleSheet,
   Text,
-  View
+  View,
+  TouchableHighlight
 } from 'react-native';
 
+import {NotificationsAndroid, PendingNotifications} from './notifications';
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -21,13 +24,52 @@ const styles = StyleSheet.create({
 });
 
 class MainComponent extends Component {
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      elapsed: 0,
+      lastNotification: undefined
+    }
+  }
+
+  componentWillMount() {
+    NotificationsAndroid.setRegistrationTokenUpdateListener(this.onPushRegistered.bind(this));
+    NotificationsAndroid.setNotificationOpenedListener(this.onNotificationOpened.bind(this));
+    NotificationsAndroid.setNotificationReceivedListener(this.onNotificationReceived.bind(this));
+
+    setInterval(this.onTick.bind(this), 1000);
+  }
+
+  onTick() {
+    this.setState({elapsed: this.state.elapsed + 1});
+  }
+
   render() {
     return (
       <View style={styles.container}>
-        <Text style={styles.mainText}>Wix React Native Notifications</Text>
+        <TouchableHighlight onPress={() => {console.log("Touch")}}>
+          <Text style={styles.mainText}>Wix React Native Notifications</Text>
+        </TouchableHighlight>
+        <Text style={styles.mainText}>Last notification:</Text>
+        <Text style={styles.mainText}>{this.state.lastNotification ? this.state.lastNotification.body + ` (opened at ''${this.state.notificationRxTime})` : "N/A"}</Text>
+        <Text style={styles.mainText}>Time elapsed: {this.state.elapsed}</Text>
       </View>
     )
   }
+
+  onPushRegistered() {
+  }
+
+  onNotificationOpened(notification) {
+    console.log("onNotificationOpened: ", notification);
+    this.setState({lastNotification: notification.getData(), notificationRxTime: this.state.elapsed});
+  }
+
+  onNotificationReceived(notification) {
+    console.log("onNotificationReceived: ", notification);
+  }
 }
 
 AppRegistry.registerComponent('WixRNNotifications', () => MainComponent);
diff --git a/example/notifications.android.js b/example/notifications.android.js
new file mode 100644
index 0000000000000000000000000000000000000000..374df899d7eb3218212759823b99d2efa0550b80
--- /dev/null
+++ b/example/notifications.android.js
@@ -0,0 +1,70 @@
+require('react');
+import {NativeModules, DeviceEventEmitter} from 'react-native';
+
+const RNNotifications = NativeModules.WixRNNotification;
+
+let notificationReceivedListener;
+let notificationOpenedListener;
+let registrationTokenUpdateListener;
+
+/** A wrapper to align Android with iOS in terms on notification structure. */
+class NotificationAndroid {
+
+  constructor(notification) {
+    this.data = notification;
+  }
+
+  getData() {
+    return this.data;
+  }
+
+  getTitle() {
+    return this.data.title;
+  }
+
+  getMessage() {
+    return this.data.body;
+  }
+}
+
+export class NotificationsAndroid {
+  static setRegistrationTokenUpdateListener(listener) {
+    registrationTokenUpdateListener = DeviceEventEmitter.addListener('remoteNotificationsRegistered', listener);
+  }
+
+  static clearRegistrationTokenUpdateListener() {
+    if (registrationTokenUpdateListener) {
+      registrationTokenUpdateListener.remove();
+      registrationTokenUpdateListener = null;
+    }
+  }
+
+  static setNotificationOpenedListener(listener) {
+    notificationOpenedListener = DeviceEventEmitter.addListener('notificationOpened', (notification) => listener(new NotificationAndroid(notification)));
+  }
+
+
+  static setNotificationReceivedListener(listener) {
+    notificationReceivedListener = DeviceEventEmitter.addListener('notificationReceived', (notification) => listener(new NotificationAndroid(notification)));
+  }
+
+  static clearNotificationOpenedListener() {
+    if (notificationOpenedListener) {
+      notificationOpenedListener.remove();
+      notificationOpenedListener = null;
+    }
+  }
+
+  static clearNotificationReceivedListener() {
+    if (notificationReceivedListener) {
+      notificationReceivedListener.remove();
+      notificationReceivedListener = null;
+    }
+  }
+}
+
+  export class PendingNotifications {
+  static async getInitialNotification() {
+    return new NotificationAndroid(await RNNotifications.getInitialNotification());
+  }
+}