added support for notifier being passed in