Merged with old config files