Add changes to support sonar