Adding support for url rewrite