Changes to NotificationFactory class