#38 change List to HashMap