added map to location & structure