Updating to more modern config.