improved sonar config