Add in redirection awareness.