Changed to HashMap