multimap support refactored
multimap support refactored 2