Work with latest version of Sonar.