Added support for redirections