Switch to using EventFilterServices