Improve redirect process