Chaged to mutable.HashMap