Changed the way configuration files are loaded