Configuration rework