Move to the latest sonar API.