Redirect class enhanced