Added event type
Merge frontend