Added sonar related code.