diff --git a/example/package.json b/example/package.json
index 068f329..6879d8f 100644
--- a/example/package.json
+++ b/example/package.json
@@ -7,7 +7,7 @@
     "ios": "react-native run-ios",
     "start": "react-native start",
     "build:android": "cd android && ./gradlew assembleDebug --no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a",
-    "push": "xcrun simctl push booted com.pushexample.app payload.json",
+    "push": "xcrun simctl push booted com.pushexample2.app payload.json",
     "build:ios": "cd ios && xcodebuild -workspace PushExample.xcworkspace -scheme PushExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
   },
   "dependencies": {
diff --git a/example/src/App.tsx b/example/src/App.tsx
index b0978a8..01b6d36 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -4,20 +4,83 @@ import { StyleSheet, View, Text, Button } from 'react-native';
 import type { PushNotificationPermissionStatus } from '@candlefinance/push';
 import { module as Push } from '@candlefinance/push';
 
+Push.registerHeadlessTask(async (message) => {
+  console.log('Headless Task', message);
+});
+
 export default function App() {
+  const [permissionStatus, setPermissionStatus] = React.useState<
+    PushNotificationPermissionStatus | undefined
+  >(undefined);
+  const [isGranted, setIsGranted] = React.useState<boolean>(false);
+
+  React.useEffect(() => {
+    const { NativeEvent, NativeHeadlessTaskKey } = Push.getConstants();
+    console.log(NativeEvent, NativeHeadlessTaskKey);
+    Push.addTokenEventListener(NativeEvent.TOKEN_RECEIVED, (token) => {
+      console.log('TOKEN_RECEIVED:', token);
+    });
+    Push.addMessageEventListener(
+      NativeEvent.BACKGROUND_MESSAGE_RECEIVED,
+      (message, id) => {
+        console.log('BACKGROUND_MESSAGE_RECEIVED:', message);
+        if (id !== undefined) {
+          console.log('Completing notification:', id);
+          Push.completeNotification(id);
+        }
+      }
+    );
+    Push.addMessageEventListener(NativeEvent.NOTIFICATION_OPENED, (message) => {
+      console.log('NOTIFICATION_OPENED:', message);
+    });
+    Push.addMessageEventListener(
+      NativeEvent.FOREGROUND_MESSAGE_RECEIVED,
+      (message) => {
+        console.log('FOREGROUND_MESSAGE_RECEIVED:', message);
+      }
+    );
+    Push.addMessageEventListener(
+      NativeEvent.LAUNCH_NOTIFICATION_OPENED,
+      (message) => {
+        console.log('LAUNCH_NOTIFICATION_OPENED:', message);
+      }
+    );
+    return () => {
+      Push.removeListeners(NativeEvent.TOKEN_RECEIVED);
+      Push.removeListeners(NativeEvent.BACKGROUND_MESSAGE_RECEIVED);
+      Push.removeListeners(NativeEvent.NOTIFICATION_OPENED);
+      Push.removeListeners(NativeEvent.FOREGROUND_MESSAGE_RECEIVED);
+      Push.removeListeners(NativeEvent.LAUNCH_NOTIFICATION_OPENED);
+    };
+  }, [isGranted]);
+
   return (
     <View style={styles.container}>
-      <Text style={styles.text}>Authorization Status</Text>
+      <Text style={styles.text}>Authorization Status: {permissionStatus}</Text>
+      <Text style={styles.text}>isGranted: {isGranted}</Text>
       <Button
-        title="Request Permissions"
+        title="Get Status"
         onPress={() => {
           Push.getPermissionStatus().then(
             (status: PushNotificationPermissionStatus) => {
               console.log(status);
+              setPermissionStatus(status);
             }
           );
         }}
       />
+      <Button
+        title="Request Permissions"
+        onPress={() => {
+          Push.requestPermissions().then((granted) => {
+            console.log(granted);
+            setIsGranted(granted);
+            if (granted) {
+              Push.registerForToken();
+            }
+          });
+        }}
+      />
     </View>
   );
 }
diff --git a/ios/PushHelper.swift b/ios/PushHelper.swift
index 8d2597b..ce338ed 100644
--- a/ios/PushHelper.swift
+++ b/ios/PushHelper.swift
@@ -321,7 +321,7 @@ final class PushNotificationManager {
 
     @objc
     private func applicationDidBecomeActive() {
-        registerForRemoteNotifications()
+//        registerForRemoteNotifications()
     }
 
     @objc
diff --git a/src/apis/index.ts b/src/apis/index.ts
index f83c595..b279a5e 100644
--- a/src/apis/index.ts
+++ b/src/apis/index.ts
@@ -9,3 +9,4 @@ export { registerHeadlessTask } from './registerHeadlessTask';
 export { requestPermissions } from './requestPermissions';
 export { setBadgeCount } from './setBadgeCount';
 export { registerForToken } from './registerForToken';
+export { removeListeners } from './removeListeners';
diff --git a/src/apis/removeListeners.ts b/src/apis/removeListeners.ts
new file mode 100644
index 0000000..9ad86e6
--- /dev/null
+++ b/src/apis/removeListeners.ts
@@ -0,0 +1,5 @@
+import { nativeEventEmitter } from '../nativeModule';
+
+export const removeListeners = (event: string) => {
+  nativeEventEmitter.removeAllListeners(event);
+};
diff --git a/src/index.ts b/src/index.ts
index 8d116ac..2160718 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,6 +10,7 @@ import {
   requestPermissions,
   setBadgeCount,
   registerForToken,
+  removeListeners,
 } from './apis';
 
 export type {
@@ -30,6 +31,7 @@ const module = {
   requestPermissions,
   setBadgeCount,
   registerForToken,
+  removeListeners,
 };
 
 export type PushNotificationModule = typeof module;
diff --git a/src/types/module.ts b/src/types/module.ts
index 680847e..bf9bb6a 100644
--- a/src/types/module.ts
+++ b/src/types/module.ts
@@ -14,13 +14,13 @@ export interface PushNotificationMessage {
   fcmOptions?: FcmPlatformOptions;
   apnsOptions?: ApnsPlatformOptions;
   data?: Record<string, unknown>;
+  custom?: any;
 }
 
 export type PushNotificationPermissionStatus =
   | 'denied'
   | 'granted'
-  | 'shouldRequest'
-  | 'shouldExplainThenRequest';
+  | 'notDetermined';
 
 interface ApnsPlatformOptions {
   subtitle?: string;
diff --git a/src/types/native.ts b/src/types/native.ts
index d99c0b8..e9f793a 100644
--- a/src/types/native.ts
+++ b/src/types/native.ts
@@ -9,7 +9,7 @@ export interface PushNotificationNativeModule extends NativeModule {
   completeNotification?(completionHandlerId: string): void;
   getConstants(): {
     NativeEvent: {
-      BACKGROUND_MESSAGE_RECEIVED?: string;
+      BACKGROUND_MESSAGE_RECEIVED: string;
       FOREGROUND_MESSAGE_RECEIVED: string;
       LAUNCH_NOTIFICATION_OPENED: string;
       NOTIFICATION_OPENED: string;
diff --git a/src/utils/normalizeNativeMessage.ts b/src/utils/normalizeNativeMessage.ts
index f5508e8..ec9952a 100644
--- a/src/utils/normalizeNativeMessage.ts
+++ b/src/utils/normalizeNativeMessage.ts
@@ -27,13 +27,14 @@ export const normalizeNativeMessage = (
   } else {
     return null;
   }
-  const { body, imageUrl, title, options, data } = normalized;
+  const { body, imageUrl, title, options, data, custom } = normalized;
 
   return {
     body,
     data,
     imageUrl,
     title,
+    custom,
     ...options,
   };
 };
@@ -43,7 +44,7 @@ const normalizeApnsMessage = (apnsMessage: ApnsMessage): NormalizedValues => {
   const { body, title } = aps.alert ?? {};
   const options = getApnsOptions(apnsMessage);
 
-  return { body, title, options, data, custom };
+  return { body, title, options, data, custom: custom };
 };
 
 const normalizeFcmMessage = (fcmMessage: FcmMessage): NormalizedValues => {
diff --git a/src/utils/normalizeNativePermissionStatus.ts b/src/utils/normalizeNativePermissionStatus.ts
index 3a921fa..642a96a 100644
--- a/src/utils/normalizeNativePermissionStatus.ts
+++ b/src/utils/normalizeNativePermissionStatus.ts
@@ -11,10 +11,9 @@ export const normalizeNativePermissionStatus = (
 ): PushNotificationPermissionStatus => {
   switch (nativeStatus) {
     case 'ShouldRequest':
-      return 'shouldRequest';
     case 'NotDetermined':
     case 'ShouldExplainThenRequest':
-      return 'shouldExplainThenRequest';
+      return 'notDetermined';
     case 'Authorized':
     case 'Granted':
       return 'granted';