Refactor Redirect service