Rework structured_stage