Adding support for vanity urls