Improved config schema