Added Sonar support