Changing name from HashMap to Map