Rework how config is get/set