Switching over to use CDN