Added support for generic events.