Merge
Add event type field