Refactoring the configuration to match the changes to the config