add map and address for events