Restructuring before committing the DPG component