Added EDA overrides