Rework config