Tweak to add redire support