Since some map classes from my Util project have been replaced with google guavas MultiMap, this project had to be updated.