Update for new config format