Add full rewrite handler support