Refactor redirections