Config rework