Modified the way the config files get loaded