Better support CDN