Improve SDNC Sonar coverage