Adding CodePro suggestions