Add support for local overrides