Added sonar's support