Move more into the config, including proxies!