Add sonar support