Passing config around better