Better order for config data