Updated to use CDNs