Updates for new config file format