added support for events with no data