Re-adding redirect handler