Add support for new event routing.