Adding support for any type of redirect