Push Notification improvements