Changes to the config loader