Add support for subdomains and paths