More multisite support (subdomains untested)