HashMap changed to <Long, Integer>