Enh/config updates