MultiMap API improvements