More changes for config