Added Cloudfront support