Update configuration change to minimize number of variables pushed to global visibility.