Changed creating hashmap to use Maps.newHashMap() to match the rest of the code