Rework subflow edit process