Modified the Push Notification Service