Rework config load