Switch to multimaps