changed data collection from List to Map for peers