Only populate from config when it's changed