Finish refactor of config reloading