Update config for easier overriding