Rework ordering of config array