Changes for Sonar