Update to HashMultimap