Adding CDN support