[WIP] Allow Event Dispatcher versions greater than 2.1