Removed all direct references to HashMap (replaced with guava Maps.newHashMap())