Added sonar integration