Move config options into components that need them