Add support for redirecs