Merge "Used entrySet instead of keySet"