Added more event types to event map rules