Support old style overrides

Overrides will be merged on top of the config file