Migration to new control structure