Replace engine.subs with Notifier