Resolve "Performance - Inefficient use of keySet iterator instead of
entrySet iterator" Sonar issue