Use new config schema