Remove MultiMap idea and passing in an object since it's not likely that either will happen soon.