Changed map to use map-eventˆ