Refactor EventsProvider to take an EventHandler