changes for new sonar version