Added subdomain code (disabled for now)