Added support for events edges