Move stream notifiers to main