Have Configuration define the defaults
Move configuration merging logic to Configuration