Added support for Sonar.