Added redirection support