Changed to merge in config values rather than overriding