Added redirection enhancements