Settings exchange infrastructure changes