Modifs to manage redirections