Improved MultiMap to be a Map