added addresses and map