added SONAR support