Added Sonar code