Updated the way the configuration files are loaded