Add support for config overrides