Using AddEventWatcher instead of setting event filter