Updated the way the config is loaded