Changed HashMap to {Map=>MutableMap} in line with other code