Replaced Hash with Map