Use new config type