Correct config refacto