More changes for the simpler config.