Refactored Push Notification System.