WELD-1754 Replace Multimap - first attempt