Added sonar support

Some tweaking needed