Added option to prevent enabling CDN