Added Sonar Widget and supporting classes