Changed storage method from List to HashMap to improve performance.