WebNotificationServer Refactoring