Refactoring of Notification Server