Added factories to notifier