Added sonar hooks