CM: Add Sonar Support