Added code for sonar.