Improve SonarManager.