Added some sonar stuff.