[issue #42] replaced multimap with proper default collections