Added 'Event' Event type handling