Collection syntax change because of Sonar