added mapping of events