Added Sonar support.