Add support for latest version of Sonar plugin