Adding redirection-support