Refactor SonarManager