Added support for reverse and redirect