Simplify config overriding