Updated to new config file loading