Added CDN support