Added subdomain resolution