Add fallback for old flows