Added CDN and query string options.