Redirect pipeline and updates to redirect logic