Added support for Sonar