Added support for event_type