Configuration: rework how dependency making is handled